From 05c9d551d854951c4fe2786f063eab8a925e43cd Mon Sep 17 00:00:00 2001 From: Bryce Lee Date: Thu, 12 Jan 2023 16:20:46 -0800 Subject: [PATCH] Do not allow system gestures when dreaming. Currently, TaskBar expansion is allowed when an activity context is available. Since Dreams are implemented as an activity, this leads to being able to expand the TaskBar over a dream. This changelist updates the logic to not allow system gestures when dreaming. Test: manual Bug: 265755700 Change-Id: If58608c1e491da7906a2615681da0514fa49cfc8 Merged-In: If58608c1e491da7906a2615681da0514fa49cfc8 --- .../com/android/quickstep/RecentsAnimationDeviceState.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java b/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java index f1c0f3e210..600ea5e3fd 100644 --- a/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java +++ b/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java @@ -32,6 +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_DEVICE_DREAMING; 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; @@ -337,7 +338,8 @@ public class RecentsAnimationDeviceState implements DisplayInfoChangeListener { && (mSystemUiStateFlags & SYSUI_STATE_QUICK_SETTINGS_EXPANDED) == 0 && (mSystemUiStateFlags & SYSUI_STATE_MAGNIFICATION_OVERLAP) == 0 && ((mSystemUiStateFlags & SYSUI_STATE_HOME_DISABLED) == 0 - || (mSystemUiStateFlags & SYSUI_STATE_OVERVIEW_DISABLED) == 0); + || (mSystemUiStateFlags & SYSUI_STATE_OVERVIEW_DISABLED) == 0) + && (mSystemUiStateFlags & SYSUI_STATE_DEVICE_DREAMING) == 0; } /**