diff options
author | Brint E. Kriebel <bekit@cyngn.com> | 2014-12-23 15:33:32 -0800 |
---|---|---|
committer | Brint E. Kriebel <bekit@cyngn.com> | 2014-12-23 15:33:32 -0800 |
commit | af5a66ec01619dc5a68ba43dc69809c03bb251e0 (patch) | |
tree | 4edd718012dbb06768654b018e0c9604d3f31717 /src/com | |
parent | cf5c3ec94437ec1c94b6e7f5051bd16d425558d9 (diff) | |
parent | 3088232f3004e5a0616b9e6a51d423cfe1679b98 (diff) | |
download | packages_apps_Trebuchet-stable/cm-11.0.tar.gz packages_apps_Trebuchet-stable/cm-11.0.tar.bz2 packages_apps_Trebuchet-stable/cm-11.0.zip |
Merge branch 'cm-11.0' into stable/cm-11.0cm-11.0-XNPH05Q-bacon-5229c4ef56stable/cm-11.0-XNF9Xstable/cm-11.0
Diffstat (limited to 'src/com')
-rw-r--r-- | src/com/android/launcher3/Launcher.java | 15 |
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; |