Merge "Adding migration Clings. (Bug 11973614)" into jb-ub-now-kermit

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

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

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

diff --cc src/com/android/launcher3/LauncherModel.java
index 2559d3d,498d91a..d271976
--- 1/src/com/android/launcher3/LauncherModel.java
--- 2/src/com/android/launcher3/LauncherModel.java
+++ b/src/com/android/launcher3/LauncherModel.java
@@@ -75,13 -75,11 +75,15 @@@ public class LauncherModel extends Broa
      // false = strew non-workspace apps across the workspace on upgrade
      public static final boolean UPGRADE_USE_MORE_APPS_FOLDER = false;
  
 +    public static final int LOADER_FLAG_NONE = 0;
 +    public static final int LOADER_FLAG_CLEAR_WORKSPACE = 1 << 0;
 +    public static final int LOADER_FLAG_MIGRATE_SHORTCUTS = 1 << 1;
 +
      private static final int ITEMS_CHUNK = 6; // batch size for the workspace icons
      private static final long INVALID_SCREEN_ID = -1L;
+ 
      private final boolean mAppsCanBeOnRemoveableStorage;
+     private final boolean mOldContentProviderExists;
  
      private final LauncherAppState mApp;
      private final Object mLock = new Object();