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

Commit 8998e466 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Merge cherrypicks of ['googleplex-android-review.googlesource.com/21050546'] into tm-qpr2-release. 

Change-Id: I84b14c4fdd8b6fdf8b3164aefb2af319e7bf3b85
parents 30d412c3 3914bd49

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