diff options
| author | Jordan Demeulenaere <jdemeulenaere@google.com> | 2022-02-11 15:20:19 +0100 |
|---|---|---|
| committer | Jordan Demeulenaere <jdemeulenaere@google.com> | 2022-02-22 11:09:03 +0100 |
| commit | 78ef3a5348cac0e1ce9084b144e7724916ec75df (patch) | |
| tree | 7faf4a40ed8be2a20ecdbb8cf7c4f65cb12b456b /quickstep | |
| parent | e424f57dcbf6d8a38df09fed8652c23f3dc23cb3 (diff) | |
| download | Launcher3-78ef3a5348cac0e1ce9084b144e7724916ec75df.tar.gz | |
Enable back gesture when a SyUI dialog is showing (2/2)
Test: Manual
Bug: 210270549
Change-Id: I8fbf9a90287cbd8d9ddad354e24bbc4d074bd0ef
Diffstat (limited to 'quickstep')
| -rw-r--r-- | quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java | 6 | ||||
| -rw-r--r-- | quickstep/src/com/android/quickstep/TouchInteractionService.java | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java b/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java index 4d79202a96..f48a26247b 100644 --- a/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java +++ b/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java @@ -32,7 +32,7 @@ import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_A import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_ALLOW_GESTURE_IGNORING_BAR_VISIBILITY; import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_ASSIST_GESTURE_CONSTRAINED; import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_BUBBLES_EXPANDED; -import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_GLOBAL_ACTIONS_SHOWING; +import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_DIALOG_SHOWING; import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_HOME_DISABLED; import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_IME_SHOWING; import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_MAGNIFICATION_OVERLAP; @@ -453,8 +453,8 @@ public class RecentsAnimationDeviceState implements /** * @return whether the global actions dialog is showing */ - public boolean isGlobalActionsShowing() { - return (mSystemUiStateFlags & SYSUI_STATE_GLOBAL_ACTIONS_SHOWING) != 0; + public boolean isSystemUiDialogShowing() { + return (mSystemUiStateFlags & SYSUI_STATE_DIALOG_SHOWING) != 0; } /** diff --git a/quickstep/src/com/android/quickstep/TouchInteractionService.java b/quickstep/src/com/android/quickstep/TouchInteractionService.java index 0c34ead13d..9627147314 100644 --- a/quickstep/src/com/android/quickstep/TouchInteractionService.java +++ b/quickstep/src/com/android/quickstep/TouchInteractionService.java @@ -701,7 +701,7 @@ public class TouchInteractionService extends Service // If Bubbles is expanded, use the overlay input consumer, which will close Bubbles // instead of going all the way home when a swipe up is detected. - if (mDeviceState.isBubblesExpanded() || mDeviceState.isGlobalActionsShowing()) { + if (mDeviceState.isBubblesExpanded() || mDeviceState.isSystemUiDialogShowing()) { base = new SysUiOverlayInputConsumer( getBaseContext(), mDeviceState, mInputMonitorCompat); } |