diff options
author | Raj Yengisetty <rajesh@cyngn.com> | 2014-11-10 10:35:01 -0800 |
---|---|---|
committer | Adnan <adnan@cyngn.com> | 2014-11-19 15:53:57 -0800 |
commit | 506b0b660d7e8ee198c5f1052191bfea8968addf (patch) | |
tree | 3b1251d161ad25a24fe12a8588933ab7e5c1f6b8 /src/com/android/launcher3/Workspace.java | |
parent | 38971be4230e2b33daf15be37822f70f81dfe81c (diff) | |
download | android_packages_apps_Trebuchet-506b0b660d7e8ee198c5f1052191bfea8968addf.tar.gz android_packages_apps_Trebuchet-506b0b660d7e8ee198c5f1052191bfea8968addf.tar.bz2 android_packages_apps_Trebuchet-506b0b660d7e8ee198c5f1052191bfea8968addf.zip |
Minimize greedy UI updating for Live Settings
Conflicts:
src/com/android/launcher3/Launcher.java
src/com/android/launcher3/list/SettingsPinnedHeaderAdapter.java
Change-Id: Ib475af4bea7d45e36ca87be6b66a60d15018aa5b
Diffstat (limited to 'src/com/android/launcher3/Workspace.java')
-rw-r--r-- | src/com/android/launcher3/Workspace.java | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java index f2388ceb4..13ee53f57 100644 --- a/src/com/android/launcher3/Workspace.java +++ b/src/com/android/launcher3/Workspace.java @@ -2154,12 +2154,15 @@ public class Workspace extends SmoothPagedView } public void exitOverviewMode(int snapPage, boolean animated) { + ((SlidingUpPanelLayout) mLauncher.getOverviewPanel()).collapsePane(); + enableOverviewMode(false, snapPage, animated); } private void enableOverviewMode(boolean enable, int snapPage, boolean animated) { - //Check to see if Settings need to taken + // Check to see if new Settings need to taken reloadSettings(); + mLauncher.updateGridIfNeeded(); State finalState = Workspace.State.OVERVIEW; if (!enable) { @@ -2313,6 +2316,9 @@ public class Workspace extends SmoothPagedView if (snapPage == -1) { snapPage = getPageNearestToCenterOfScreen(); } + if (hasCustomContent()) { + snapPage = Math.max(1, snapPage); + } snapToPage(snapPage, duration, mZoomInInterpolator); for (int i = 0; i < getChildCount(); i++) { |