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

Commit 5f9b26b6 authored by Winson Chung's avatar Winson Chung Committed by Automerger Merge Worker
Browse files

Prevent falling into OtherActivityInputConsumer when over lockscreen am:... 

Prevent falling into OtherActivityInputConsumer when over lockscreen am: f6d75c98 am: 3c265823 am: cabcc513

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



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

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

+2 −0
Original line number Diff line number Diff line
@@ -42,6 +42,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;
@@ -334,6 +335,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