Merge "New launcher2 icon migration algorithm." into jb-ub-now-kermit

diff --cc src/com/android/launcher3/Launcher.java
index 3bea941,ceb31b0..db36030
--- 1/src/com/android/launcher3/Launcher.java
--- 2/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@@ -4704,3 -4682,8 +4719,8 @@@ interface LauncherTransitionable 
      void onLauncherTransitionStep(Launcher l, float t);
      void onLauncherTransitionEnd(Launcher l, boolean animated, boolean toWorkspace);
  }
 -}
+ 
+ interface DebugIntents {
+     static final String DELETE_DATABASE = "com.android.launcher3.action.DELETE_DATABASE";
+     static final String MIGRATE_DATABASE = "com.android.launcher3.action.MIGRATE_DATABASE";
++}

diff --cc src/com/android/launcher3/LauncherModel.java
Simple merge

diff --cc src/com/android/launcher3/LauncherProvider.java
index 1fb58cc,3cacd6c..7adbade
--- 1/src/com/android/launcher3/LauncherProvider.java
--- 2/src/com/android/launcher3/LauncherProvider.java
+++ b/src/com/android/launcher3/LauncherProvider.java
@@@ -287,8 -292,13 +292,13 @@@ public class LauncherProvider extends C
          }
      }
  
+     public void migrateLauncher2Shortcuts() {
+         mOpenHelper.migrateLauncher2Shortcuts(mOpenHelper.getWritableDatabase(),
+                 LauncherSettings.Favorites.OLD_CONTENT_URI);
+     }
+ 
      private static int getDefaultWorkspaceResourceId() {
 -        if (AppsCustomizePagedView.DISABLE_ALL_APPS) {
 +        if (LauncherAppState.isDisableAllApps()) {
              return R.xml.default_workspace_no_all_apps;
          } else {
              return R.xml.default_workspace;