diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2019-02-18 19:26:54 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-02-18 19:26:54 +0000 |
| commit | a58934e00be069827773c4ffdc43ed6d3c4b724d (patch) | |
| tree | 23f06c8f7f23ecca2c53c25494f62a5ac306227c /src | |
| parent | 422885d2cacebda47f78116f26b489e1ebe3c306 (diff) | |
| parent | 6895e409a1c01f9b84918b7dc1ff38a1759366a5 (diff) | |
| download | android_packages_apps_Trebuchet-a58934e00be069827773c4ffdc43ed6d3c4b724d.tar.gz android_packages_apps_Trebuchet-a58934e00be069827773c4ffdc43ed6d3c4b724d.tar.bz2 android_packages_apps_Trebuchet-a58934e00be069827773c4ffdc43ed6d3c4b724d.zip | |
Merge "Adding NORMAL_STATE_ORDINAL" into ub-launcher3-master
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/launcher3/LauncherState.java | 4 | ||||
| -rw-r--r-- | src/com/android/launcher3/TestProtocol.java | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/com/android/launcher3/LauncherState.java b/src/com/android/launcher3/LauncherState.java index 471d28d3f..6d8561269 100644 --- a/src/com/android/launcher3/LauncherState.java +++ b/src/com/android/launcher3/LauncherState.java @@ -21,6 +21,7 @@ import static android.view.accessibility.AccessibilityEvent.TYPE_WINDOW_STATE_CH 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.NORMAL_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; @@ -81,7 +82,8 @@ public class LauncherState { /** * TODO: Create a separate class for NORMAL state. */ - public static final LauncherState NORMAL = new LauncherState(0, ContainerType.WORKSPACE, 0, + public static final LauncherState NORMAL = new LauncherState(NORMAL_STATE_ORDINAL, + ContainerType.WORKSPACE, 0, FLAG_DISABLE_RESTORE | FLAG_WORKSPACE_ICONS_CAN_BE_DRAGGED | FLAG_HIDE_BACK_BUTTON | FLAG_HAS_SYS_UI_SCRIM); diff --git a/src/com/android/launcher3/TestProtocol.java b/src/com/android/launcher3/TestProtocol.java index f19b0e007..23df79e3b 100644 --- a/src/com/android/launcher3/TestProtocol.java +++ b/src/com/android/launcher3/TestProtocol.java @@ -25,6 +25,7 @@ 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 NORMAL_STATE_ORDINAL = 0; 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; |