diff options
| author | Matt Garnes <matt@cyngn.com> | 2015-05-12 18:02:32 -0700 |
|---|---|---|
| committer | Matt Garnes <matt@cyngn.com> | 2015-05-13 01:13:30 +0000 |
| commit | 8df1f02140d329ff5edc03cc9cf89e92cb63dcbb (patch) | |
| tree | 7f2ca1066591b9a5c2494d57e0ecbbc33a73d861 | |
| parent | 18980a7440ead7623e086098a2139f1218620b64 (diff) | |
| download | android_packages_apps_Trebuchet-8df1f02140d329ff5edc03cc9cf89e92cb63dcbb.tar.gz android_packages_apps_Trebuchet-8df1f02140d329ff5edc03cc9cf89e92cb63dcbb.tar.bz2 android_packages_apps_Trebuchet-8df1f02140d329ff5edc03cc9cf89e92cb63dcbb.zip | |
Do not reload settings for changing state to All Apps.
When getStateChangeAnimation() is called, only reload settings if
leaving overview mode.
Change-Id: I9ee7330779b19bb73c1a30497065854ce9fc1162
| -rw-r--r-- | src/com/android/launcher3/Workspace.java | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java index 298589650..fbdb8829d 100644 --- a/src/com/android/launcher3/Workspace.java +++ b/src/com/android/launcher3/Workspace.java @@ -2286,9 +2286,6 @@ public class Workspace extends SmoothPagedView return null; } - // Check to see if new Settings need to be taken - reloadSettings(); - // Initialize animation arrays for the first time if necessary initAnimationArrays(); @@ -2319,6 +2316,11 @@ public class Workspace extends SmoothPagedView final boolean workspaceToOverview = (oldStateIsNormal && stateIsOverview); final boolean overviewToWorkspace = (oldStateIsOverview && stateIsNormal); + if (overviewToWorkspace || overviewToAllApps) { + // Check to see if new Settings need to be taken + reloadSettings(); + } + mNewScale = 1.0f; if (oldStateIsOverview) { |