commit c99cb174c3369c8c192efc12d97dd8e9f6d189b9
author Sunny Goyal <sunnygoyal@google.com> Thu Oct 19 16:15:09 2017 -0700
committer Sunny Goyal <sunnygoyal@google.com> Fri Oct 20 13:56:47 2017 -0700
tree e5d112b3fe7fba4c5306242f89fb25ee91874db2
parent cac861068eeb088ef8524bd39ecba0f2006c02e9

Moving some state specific logic to subclass of LauncherState

Bug: 67678570
Change-Id: I1316f91c9f19bd572e4a0da67a22fa8921e1dcf9

src/com/android/launcher3/LauncherState.java

diff --git a/src/com/android/launcher3/LauncherState.java b/src/com/android/launcher3/LauncherState.java
index 4619f4e..0ac27e5 100644
--- a/src/com/android/launcher3/LauncherState.java
+++ b/src/com/android/launcher3/LauncherState.java
@@ -19,9 +19,9 @@
 import static android.view.View.IMPORTANT_FOR_ACCESSIBILITY_NO_HIDE_DESCENDANTS;
 
 import static com.android.launcher3.LauncherAnimUtils.ALL_APPS_TRANSITION_MS;
-import static com.android.launcher3.LauncherAnimUtils.OVERVIEW_TRANSITION_MS;
-import static com.android.launcher3.LauncherAnimUtils.SPRING_LOADED_TRANSITION_MS;
 
+import com.android.launcher3.states.OverviewState;
+import com.android.launcher3.states.SpringLoadedState;
 import com.android.launcher3.userevent.nano.LauncherLogProto.ContainerType;
 
 import java.util.Arrays;
@@ -40,19 +40,15 @@
 
     private static final LauncherState[] sAllStates = new LauncherState[4];
 
-    public static LauncherState NORMAL = new LauncherState(0, ContainerType.WORKSPACE,
+    public static final LauncherState NORMAL = new LauncherState(0, ContainerType.WORKSPACE,
             0, FLAG_DO_NOT_RESTORE);
 
-    public static LauncherState ALL_APPS = new LauncherState(1, ContainerType.ALLAPPS,
+    public static final LauncherState ALL_APPS = new LauncherState(1, ContainerType.ALLAPPS,
             ALL_APPS_TRANSITION_MS, FLAG_DISABLE_ACCESSIBILITY);
 
-    public static LauncherState SPRING_LOADED = new LauncherState(2, ContainerType.WORKSPACE,
-            SPRING_LOADED_TRANSITION_MS,
-            FLAG_SHOW_SCRIM | FLAG_MULTI_PAGE | FLAG_DISABLE_ACCESSIBILITY | FLAG_DO_NOT_RESTORE);
+    public static final LauncherState SPRING_LOADED = new SpringLoadedState(2);
 
-    public static LauncherState OVERVIEW = new LauncherState(3, ContainerType.OVERVIEW,
-            OVERVIEW_TRANSITION_MS,
-            FLAG_SHOW_SCRIM | FLAG_MULTI_PAGE | FLAG_HIDE_HOTSEAT | FLAG_DO_NOT_RESTORE);
+    public static final LauncherState OVERVIEW = new OverviewState(3);
 
     public final int ordinal;
 
@@ -101,4 +97,12 @@
     public static LauncherState[] values() {
         return Arrays.copyOf(sAllStates, sAllStates.length);
     }
+
+    public float[] getWorkspaceScaleAndTranslation(Launcher launcher) {
+        return new float[] {1, 0};
+    }
+
+    public void onStateEnabled(Launcher launcher) { }
+
+    public void onStateDisabled(Launcher launcher) { }
 }