Skip to content

Commit bf0b003

Browse files
committed
Merge tag 'android-13.0.0_r41' into HEAD
Android 13.0.0 Release 41 (TQ2A.230405.003.E1)
2 parents 134dcf6 + 8998e46 commit bf0b003

1 file changed

Lines changed: 2 additions & 0 deletions

File tree

quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_OVERVIEW_DISABLED;
4444
import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_QUICK_SETTINGS_EXPANDED;
4545
import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_SCREEN_PINNING;
46+
import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_STATUS_BAR_KEYGUARD_SHOWING;
4647
import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_STATUS_BAR_KEYGUARD_SHOWING_OCCLUDED;
4748

4849
import android.app.ActivityTaskManager;
@@ -381,6 +382,7 @@ public boolean canStartSystemGesture() {
381382
|| mRotationTouchHelper.isTaskListFrozen();
382383
return canStartWithNavHidden
383384
&& (mSystemUiStateFlags & SYSUI_STATE_NOTIFICATION_PANEL_EXPANDED) == 0
385+
&& (mSystemUiStateFlags & SYSUI_STATE_STATUS_BAR_KEYGUARD_SHOWING) == 0
384386
&& (mSystemUiStateFlags & SYSUI_STATE_QUICK_SETTINGS_EXPANDED) == 0
385387
&& (mSystemUiStateFlags & SYSUI_STATE_MAGNIFICATION_OVERLAP) == 0
386388
&& ((mSystemUiStateFlags & SYSUI_STATE_HOME_DISABLED) == 0

0 commit comments

Comments
 (0)