summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher3/Launcher.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/com/android/launcher3/Launcher.java')
-rw-r--r--src/com/android/launcher3/Launcher.java15
1 files changed, 10 insertions, 5 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index edfcc6c9b..737cb0d30 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -1166,8 +1166,6 @@ public class Launcher extends Activity
}
super.onResume();
- updateGridIfNeeded();
-
// Restore the previous launcher state
if (mOnResumeState == State.WORKSPACE) {
showWorkspace(false);
@@ -1281,6 +1279,8 @@ public class Launcher extends Activity
} else {
mHiddenFolderAuth = false;
}
+
+ updateGridIfNeeded();
}
@Override
@@ -1405,10 +1405,14 @@ public class Launcher extends Activity
}
public void setDynamicGridSize(DeviceProfile.GridSize size) {
- SettingsProvider.putInt(this,
- SettingsProvider.SETTINGS_UI_DYNAMIC_GRID_SIZE, size.getValue());
+ int gridSize = SettingsProvider.getIntCustomDefault(this,
+ SettingsProvider.SETTINGS_UI_DYNAMIC_GRID_SIZE, 0);
+ if (gridSize != size.getValue()) {
+ SettingsProvider.putInt(this,
+ SettingsProvider.SETTINGS_UI_DYNAMIC_GRID_SIZE, size.getValue());
- updateDynamicGrid();
+ setUpdateDynamicGrid();
+ }
mOverviewSettingsPanel.notifyDataSetInvalidated();
@@ -3766,6 +3770,7 @@ public class Launcher extends Activity
// Change the state *after* we've called all the transition code
mState = State.WORKSPACE;
+ setWorkspaceBackground(mState == State.WORKSPACE);
// Resume the auto-advance of widgets
mUserPresent = true;