diff options
Diffstat (limited to 'src/com/android/launcher3/Launcher.java')
-rw-r--r-- | src/com/android/launcher3/Launcher.java | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index 84f8b46c8..a8c7f146d 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -486,7 +486,7 @@ public class Launcher extends Activity super.onCreate(savedInstanceState); - initializeDynamicGrid(); + initializeDynamicGrid(false); mHideIconLabels = SettingsProvider.getBoolean(this, SettingsProvider.SETTINGS_UI_HOMESCREEN_HIDE_ICON_LABELS, R.bool.preferences_interface_homescreen_hide_icon_labels_default); @@ -571,8 +571,10 @@ public class Launcher extends Activity @Override public void onLauncherProviderChange() { } - private void initializeDynamicGrid() { - LauncherAppState.setApplicationContext(getApplicationContext()); + private void initializeDynamicGrid(boolean updateGrid) { + if (!updateGrid) { + LauncherAppState.setApplicationContext(getApplicationContext()); + } LauncherAppState app = LauncherAppState.getInstance(); mHideIconLabels = SettingsProvider.getBoolean(this, @@ -5231,6 +5233,9 @@ public class Launcher extends Activity PackageInstallerCompat.getInstance(this).onFinishBind(); mModel.recheckRestoredItems(this); mWorkspace.stripEmptyScreens(); + if (mWorkspace.isInOverviewMode()) { + mWorkspace.resetOverviewMode(); + } } private void sendLoadingCompleteBroadcastIfNecessary() { @@ -5891,7 +5896,7 @@ public class Launcher extends Activity public void updateDynamicGrid(int page) { mSearchDropTargetBar.setupQSB(Launcher.this); - initializeDynamicGrid(); + initializeDynamicGrid(true); mGrid.layout(Launcher.this); |