From c77d9d3d7b574a4995b00be3d8bf3ac217ad280a Mon Sep 17 00:00:00 2001 From: Bill Lin Date: Thu, 28 May 2020 13:00:42 +0800 Subject: [PATCH] Align rvc-dev QuickStepContract order ag/11495551 introduce the bit # located at 15 public static final int SYSUI_STATE_GLOBAL_ACTIONS_SHOWING = 1 << 15 Due to one handed feature do not merged in rvc-dev We should align the order on master branch Test: make Bug: 155499313 Change-Id: I6bad6faf3b1cf1d3105a23c121375cceafa91ed0 --- .../android/systemui/shared/system/QuickStepContract.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/SystemUI/shared/src/com/android/systemui/shared/system/QuickStepContract.java b/packages/SystemUI/shared/src/com/android/systemui/shared/system/QuickStepContract.java index 9e5e323aeb4f5..bdfc65e883009 100644 --- a/packages/SystemUI/shared/src/com/android/systemui/shared/system/QuickStepContract.java +++ b/packages/SystemUI/shared/src/com/android/systemui/shared/system/QuickStepContract.java @@ -86,10 +86,10 @@ public class QuickStepContract { // enabled (since it's used to navigate back within the bubbled app, or to collapse the bubble // stack. public static final int SYSUI_STATE_BUBBLES_EXPANDED = 1 << 14; - // The one-handed mode is active - public static final int SYSUI_STATE_ONE_HANDED_ACTIVE = 1 << 15; // The global actions dialog is showing - public static final int SYSUI_STATE_GLOBAL_ACTIONS_SHOWING = 1 << 16; + public static final int SYSUI_STATE_GLOBAL_ACTIONS_SHOWING = 1 << 15; + // The one-handed mode is active + public static final int SYSUI_STATE_ONE_HANDED_ACTIVE = 1 << 16; @Retention(RetentionPolicy.SOURCE) @IntDef({SYSUI_STATE_SCREEN_PINNING,