diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-03-07 18:54:52 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-03-07 18:54:52 +0000 |
| commit | ba4a1e0b452ea3452db71d2d9db76ab37721142d (patch) | |
| tree | 129aed882404a8ad393546dbcbb6aba1be310c55 | |
| parent | 2c34cba0d3ca7bd93edc884f0cebeb1435df60f7 (diff) | |
| parent | 6c5c183e4c156014bea4b8a222595b9be571b258 (diff) | |
Merge cherrypicks of ['googleplex-android-review.googlesource.com/21050546'] into sparse-9662652-L34400000958984256.
SPARSE_CHANGE: I7795abe0aebefca2d42998a672abfd12f951d501
Change-Id: Ie572a0ae8ae4d687b86ea6a4011b4fdc33b43cd7
| -rw-r--r-- | quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java | 2 |
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 |