summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Garnes <matt@cyngn.com>2015-05-13 01:02:32 (GMT)
committerMatt Garnes <matt@cyngn.com>2015-05-13 01:14:02 (GMT)
commit17b70e9a4eea164d5175caa9136b24820709f47b (patch)
tree7d3fe6f9fd609635166a4f9c259e4307c6f327f8
parentf934dab8bd78af57e2bea1b338f63ea63e909013 (diff)
downloadandroid_packages_apps_Trebuchet-17b70e9a4eea164d5175caa9136b24820709f47b.zip
android_packages_apps_Trebuchet-17b70e9a4eea164d5175caa9136b24820709f47b.tar.gz
android_packages_apps_Trebuchet-17b70e9a4eea164d5175caa9136b24820709f47b.tar.bz2
Do not reload settings for changing state to All Apps.
When getStateChangeAnimation() is called, only reload settings if leaving overview mode. Change-Id: I9ee7330779b19bb73c1a30497065854ce9fc1162 (cherry picked from commit 8df1f02140d329ff5edc03cc9cf89e92cb63dcbb)
-rw-r--r--src/com/android/launcher3/Workspace.java8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index ee812aa..093619b 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -2284,9 +2284,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();
@@ -2317,6 +2314,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) {