diff options
| author | vadimt <vadimt@google.com> | 2019-02-14 17:47:11 -0800 |
|---|---|---|
| committer | vadimt <vadimt@google.com> | 2019-02-14 17:47:11 -0800 |
| commit | 2a648aa894dd029fa2981929c3b937d68f733d78 (patch) | |
| tree | af7e9aa318a4aea63317f4d41ecc325ae37dd590 /src | |
| parent | 0589b0782922d5739e33aee41f389b0bad007916 (diff) | |
| download | android_packages_apps_Trebuchet-2a648aa894dd029fa2981929c3b937d68f733d78.tar.gz android_packages_apps_Trebuchet-2a648aa894dd029fa2981929c3b937d68f733d78.tar.bz2 android_packages_apps_Trebuchet-2a648aa894dd029fa2981929c3b937d68f733d78.zip | |
Moving state ordinals to TestProtocol
These checks immediately broke after recent change of ordinals.
Test: Tapl tests
Change-Id: Ie040f452d3f31c86f780e6f38c6f9afa0d0dcbf3
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/launcher3/LauncherState.java | 14 | ||||
| -rw-r--r-- | src/com/android/launcher3/TestProtocol.java | 4 |
2 files changed, 14 insertions, 4 deletions
diff --git a/src/com/android/launcher3/LauncherState.java b/src/com/android/launcher3/LauncherState.java index 899cdd387..471d28d3f 100644 --- a/src/com/android/launcher3/LauncherState.java +++ b/src/com/android/launcher3/LauncherState.java @@ -19,6 +19,10 @@ import static android.view.View.IMPORTANT_FOR_ACCESSIBILITY_AUTO; import static android.view.View.IMPORTANT_FOR_ACCESSIBILITY_NO_HIDE_DESCENDANTS; import static android.view.accessibility.AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED; +import static com.android.launcher3.TestProtocol.ALL_APPS_STATE_ORDINAL; +import static com.android.launcher3.TestProtocol.BACKGROUND_APP_STATE_ORDINAL; +import static com.android.launcher3.TestProtocol.OVERVIEW_STATE_ORDINAL; +import static com.android.launcher3.TestProtocol.SPRING_LOADED_STATE_ORDINAL; import static com.android.launcher3.anim.Interpolators.ACCEL_2; import static com.android.launcher3.states.RotationHelper.REQUEST_NONE; @@ -84,10 +88,12 @@ public class LauncherState { /** * Various Launcher states arranged in the increasing order of UI layers */ - public static final LauncherState SPRING_LOADED = new SpringLoadedState(1); - public static final LauncherState OVERVIEW = new OverviewState(2); - public static final LauncherState ALL_APPS = new AllAppsState(3); - public static final LauncherState BACKGROUND_APP = new BackgroundAppState(4); + public static final LauncherState SPRING_LOADED = new SpringLoadedState( + SPRING_LOADED_STATE_ORDINAL); + public static final LauncherState OVERVIEW = new OverviewState(OVERVIEW_STATE_ORDINAL); + public static final LauncherState ALL_APPS = new AllAppsState(ALL_APPS_STATE_ORDINAL); + public static final LauncherState BACKGROUND_APP = new BackgroundAppState( + BACKGROUND_APP_STATE_ORDINAL); public final int ordinal; diff --git a/src/com/android/launcher3/TestProtocol.java b/src/com/android/launcher3/TestProtocol.java index 008b624d1..f19b0e007 100644 --- a/src/com/android/launcher3/TestProtocol.java +++ b/src/com/android/launcher3/TestProtocol.java @@ -25,4 +25,8 @@ public final class TestProtocol { public static final String STATE_FIELD = "state"; public static final String SWITCHED_TO_STATE_MESSAGE = "TAPL_SWITCHED_TO_STATE"; public static final String RESPONSE_MESSAGE_POSTFIX = "_RESPONSE"; + public static final int SPRING_LOADED_STATE_ORDINAL = 1; + public static final int OVERVIEW_STATE_ORDINAL = 2; + public static final int ALL_APPS_STATE_ORDINAL = 3; + public static final int BACKGROUND_APP_STATE_ORDINAL = 4; } |