commit f9403d92fa872a9f9f487540dc989df7b80db8b8
author Sunny Goyal <sunnygoyal@google.com> Wed Oct 18 10:55:56 2017 -0700
committer Sunny Goyal <sunnygoyal@google.com> Wed Oct 18 15:04:22 2017 -0700
tree 3a6c36a863802a344e969df853f47190e764fc09
parent 4c7f215651a282ce75dec5e570a6e593be476cc5

Removing state definition from Launcher

State is only maintained is workspace and is used for all the UI

Bug: 67678570
Change-Id: Ie3cce5a1f4ada3913d0480f7918c27460dacbd34

src/com/android/launcher3/PinchThresholdManager.java

diff --git a/src/com/android/launcher3/PinchThresholdManager.java b/src/com/android/launcher3/PinchThresholdManager.java
index 8cbc33d..4937633 100644
--- a/src/com/android/launcher3/PinchThresholdManager.java
+++ b/src/com/android/launcher3/PinchThresholdManager.java
@@ -29,12 +29,14 @@
     public static final float THRESHOLD_TWO = 0.70f;
     public static final float THRESHOLD_THREE = 0.95f;
 
-    private Workspace mWorkspace;
+    private final Workspace mWorkspace;
+    private final Launcher mLauncher;
 
     private float mPassedThreshold = THRESHOLD_ZERO;
 
     public PinchThresholdManager(Workspace workspace) {
         mWorkspace = workspace;
+        mLauncher = mWorkspace.mLauncher;
     }
 
     /**
@@ -50,7 +52,7 @@
      */
     public float updateAndAnimatePassedThreshold(float progress,
             PinchAnimationManager animationManager) {
-        if (!mWorkspace.isInOverviewMode()) {
+        if (!mLauncher.isInState(LauncherState.OVERVIEW)) {
             // Invert the progress, because going from workspace to overview is 1 to 0.
             progress = 1f - progress;
         }
@@ -68,10 +70,9 @@
         }
 
         if (mPassedThreshold != previousPassedThreshold) {
-            LauncherState fromState = mWorkspace.isInOverviewMode() ? LauncherState.OVERVIEW
-                    : LauncherState.NORMAL;
-            LauncherState toState = mWorkspace.isInOverviewMode() ? LauncherState.NORMAL
-                    : LauncherState.OVERVIEW;
+            LauncherState fromState = mLauncher.getWorkspace().getState();
+            LauncherState toState = mLauncher.isInState(LauncherState.OVERVIEW)
+                    ? LauncherState.NORMAL : LauncherState.OVERVIEW;
             float thresholdToAnimate = mPassedThreshold;
             if (mPassedThreshold < previousPassedThreshold) {
                 // User reversed pinch, so heading back to the state that they started from.