From 3b1ebed232dff6dfdea2f76fe904bfa92aef4a4d Mon Sep 17 00:00:00 2001 From: Hongwei Wang Date: Wed, 26 Jun 2024 17:09:12 -0700 Subject: [PATCH] Disable gesture nav while PiP anim is running To prevent the Recents transition that may conflict with PiP Flag: EXEMPT bug fix Bug: 340724371 Test: Swipe to show TaskBar while expanding PiP to FS mode Change-Id: I87bb660c37f47dd67f7593a52eda99b167a233a9 --- .../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 7adce74f8c..a7d3890ffc 100644 --- a/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java +++ b/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java @@ -33,6 +33,7 @@ import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_A 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_DISABLE_GESTURE_PIP_ANIMATING; import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_DISABLE_GESTURE_SPLIT_INVOCATION; import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_HOME_DISABLED; import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_IME_SHOWING; @@ -412,7 +413,8 @@ public class RecentsAnimationDeviceState implements DisplayInfoChangeListener, E | SYSUI_STATE_QUICK_SETTINGS_EXPANDED | SYSUI_STATE_MAGNIFICATION_OVERLAP | SYSUI_STATE_DEVICE_DREAMING - | SYSUI_STATE_DISABLE_GESTURE_SPLIT_INVOCATION; + | SYSUI_STATE_DISABLE_GESTURE_SPLIT_INVOCATION + | SYSUI_STATE_DISABLE_GESTURE_PIP_ANIMATING; return (gestureDisablingStates & mSystemUiStateFlags) == 0 && homeOrOverviewEnabled; }