summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-01-28 13:24:22 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-01-28 13:24:22 +0000
commit970e3d9fbdc04a218e8ec2d93447013f395e141a (patch)
treed7f3f59cdaf8fecdee7209cc32e432c61889c672
parentcadc9a2d9f1a095f9fc9fdf9efa1b8d964188cc3 (diff)
parent5a0e8052678aad8d725685368bebbf55504702bf (diff)
downloadLauncher3-android13-mainline-media-release.tar.gz
Snap for 9537280 from 5a0e8052678aad8d725685368bebbf55504702bf to mainline-media-releaseaml_med_331911000aml_med_331712010aml_med_331612000android13-mainline-media-release
Change-Id: I40443f59cdb7d52360d018d0bb56d92e6c53202b
-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 4fb7e6ba06..bb9fa5e5f2 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;
@@ -383,6 +384,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