From 17b70e9a4eea164d5175caa9136b24820709f47b Mon Sep 17 00:00:00 2001 From: Matt Garnes Date: Tue, 12 May 2015 18:02:32 -0700 Subject: 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) --- src/com/android/launcher3/Workspace.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java index ee812aa0e..093619bd0 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) { -- cgit v1.2.3