summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Cohen <adamcohen@google.com>2014-05-17 01:29:26 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-05-17 01:29:26 +0000
commiteb4241f70fa1891028007943940a50913ab95c17 (patch)
tree585bbb6eea3e5eab99be4346ffb3c35edc9a260b
parente9491295a5f249c0cc5c708dff1982685ead223c (diff)
parent8457d491bf1f3989ea2cf58f20b0ff4863a668a7 (diff)
downloadandroid_packages_apps_Trebuchet-eb4241f70fa1891028007943940a50913ab95c17.tar.gz
android_packages_apps_Trebuchet-eb4241f70fa1891028007943940a50913ab95c17.tar.bz2
android_packages_apps_Trebuchet-eb4241f70fa1891028007943940a50913ab95c17.zip
am 8457d491: Removing extra clear, load and bind of default workspace
* commit '8457d491bf1f3989ea2cf58f20b0ff4863a668a7': Removing extra clear, load and bind of default workspace
-rw-r--r--src/com/android/launcher3/LauncherClings.java7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/com/android/launcher3/LauncherClings.java b/src/com/android/launcher3/LauncherClings.java
index a2cce1ab8..6d84e2be7 100644
--- a/src/com/android/launcher3/LauncherClings.java
+++ b/src/com/android/launcher3/LauncherClings.java
@@ -438,11 +438,8 @@ 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);
+ // Don't need to do anything special here. We've already loaded the default workspace,
+ // (which is the default loader behavior triggered from Launcher#onCreate.).
// Disable the migration cling
dismissMigrationCling();