Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ec09ccdc authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Merge TQ2A.230405.003" am: bb016a19 

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/2530211



Change-Id: I250f0ce2bbd3b9d663b1421ba7336e56215130c6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 77350359 bb016a19

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

+2 −0
Original line number Diff line number Diff line
@@ -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