diff options
| author | Winson Chung <winsonc@google.com> | 2014-01-10 16:46:15 -0800 |
|---|---|---|
| committer | Danesh M <daneshm90@gmail.com> | 2014-06-06 22:54:24 -0700 |
| commit | 261ddc3cc7cdaa516e67d15d0cd9beca666983a2 (patch) | |
| tree | befa0f20d2258c106856a20b11c73a7d3e851d47 /src | |
| parent | 8dbb0433f18d9c92ba0bd410e38fdcca6793d3c7 (diff) | |
| download | android_packages_apps_Trebuchet-261ddc3cc7cdaa516e67d15d0cd9beca666983a2.tar.gz android_packages_apps_Trebuchet-261ddc3cc7cdaa516e67d15d0cd9beca666983a2.tar.bz2 android_packages_apps_Trebuchet-261ddc3cc7cdaa516e67d15d0cd9beca666983a2.zip | |
Updating assets and text for migration cling. (Bug 11973614)
Change-Id: I69ffc1581cc43511b4f42ebb2735afe4c0b44131
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/launcher3/LauncherClings.java | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/com/android/launcher3/LauncherClings.java b/src/com/android/launcher3/LauncherClings.java index ec0a4238f..541eaddd0 100644 --- a/src/com/android/launcher3/LauncherClings.java +++ b/src/com/android/launcher3/LauncherClings.java @@ -399,10 +399,10 @@ class LauncherClings { 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 @@ class LauncherClings { 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(); |