summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoralk3pInjection <webmaster@raspii.tech>2023-06-02 00:30:40 +0800
committeralk3pInjection <webmaster@raspii.tech>2023-06-02 00:30:40 +0800
commit7e6f864db70407a3a3e85a47d3dd2fea33db595f (patch)
treefa52245d51f18475c8ec15f3936a65bc8ed2097a
parent10a4fead0f0c6a4a9574927556f2dccf437d33e3 (diff)
parent95c47afcfeef1c562a504fe21121c973d33e0300 (diff)
Merge tag 'LA.QSSI.13.0.r1-10200-qssi.0' into tachibanatachibana
"LA.QSSI.13.0.r1-10200-qssi.0" Change-Id: Ie3d145312052ecfcfc27dc6b277aefbaad04c07e
-rw-r--r--quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java b/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java
index 9e25555eec..d34153160d 100644
--- a/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java
+++ b/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java
@@ -43,6 +43,7 @@ import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_O
import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_OVERVIEW_DISABLED;
import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_QUICK_SETTINGS_EXPANDED;
import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_SCREEN_PINNING;
+import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_STATUS_BAR_KEYGUARD_SHOWING;
import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_STATUS_BAR_KEYGUARD_SHOWING_OCCLUDED;
import android.app.ActivityTaskManager;
@@ -381,6 +382,7 @@ public class RecentsAnimationDeviceState implements DisplayInfoChangeListener {
|| mRotationTouchHelper.isTaskListFrozen();
return canStartWithNavHidden
&& (mSystemUiStateFlags & SYSUI_STATE_NOTIFICATION_PANEL_EXPANDED) == 0
+ && (mSystemUiStateFlags & SYSUI_STATE_STATUS_BAR_KEYGUARD_SHOWING) == 0
&& (mSystemUiStateFlags & SYSUI_STATE_QUICK_SETTINGS_EXPANDED) == 0
&& (mSystemUiStateFlags & SYSUI_STATE_MAGNIFICATION_OVERLAP) == 0
&& ((mSystemUiStateFlags & SYSUI_STATE_HOME_DISABLED) == 0