commit 5317c2b7adfbfef97edc6ad9b7e007160ef689f4
author Winson Chung <winsonc@google.com> Fri Jan 10 16:46:15 2014 -0800
committer Winson Chung <winsonc@google.com> Fri Jan 10 16:59:09 2014 -0800
tree 422634a60ae6ee123b74553031259f56f0ae5f6f
parent 234b506f4625b23172d437a2ba0b47d63cc2e3dd

Updating assets and text for migration cling. (Bug 11973614)

Change-Id: I69ffc1581cc43511b4f42ebb2735afe4c0b44131

src/com/android/launcher3/LauncherClings.java

diff --git a/src/com/android/launcher3/LauncherClings.java b/src/com/android/launcher3/LauncherClings.java
index ec0a423..541eadd 100644
--- a/src/com/android/launcher3/LauncherClings.java
+++ b/src/com/android/launcher3/LauncherClings.java
@@ -399,10 +399,10 @@
     public void dismissMigrationClingCopyApps(View v) {
         // Copy the shortcuts from the old database
         LauncherModel model = mLauncher.getModel();
-//        model.resetLoadedState(false, true);
-//        model.startLoader(false, PagedView.INVALID_RESTORE_PAGE,
-//                LauncherModel.LOADER_FLAG_CLEAR_WORKSPACE
-//                        | LauncherModel.LOADER_FLAG_MIGRATE_SHORTCUTS);
+        model.resetLoadedState(false, true);
+        model.startLoader(false, PagedView.INVALID_RESTORE_PAGE,
+                LauncherModel.LOADER_FLAG_CLEAR_WORKSPACE
+                        | LauncherModel.LOADER_FLAG_MIGRATE_SHORTCUTS);
 
         // Set the flag to skip the folder cling
         String spKey = LauncherAppState.getSharedPreferencesKey();
@@ -418,9 +418,9 @@
     public void dismissMigrationClingUseDefault(View v) {
         // Clear the workspace
         LauncherModel model = mLauncher.getModel();
-//        model.resetLoadedState(false, true);
-//        model.startLoader(false, PagedView.INVALID_RESTORE_PAGE,
-//                LauncherModel.LOADER_FLAG_CLEAR_WORKSPACE);
+        model.resetLoadedState(false, true);
+        model.startLoader(false, PagedView.INVALID_RESTORE_PAGE,
+                LauncherModel.LOADER_FLAG_CLEAR_WORKSPACE);
 
         // Disable the migration cling
         dismissMigrationCling();