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

Commit 55c85ef2 authored by Bryce Lee's avatar Bryce Lee Committed by Automerger Merge Worker
Browse files

Merge "Revert "Do not allow system gestures when dreaming."" into tm-qpr-dev am: 12764430 

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



Change-Id: Id879fd8d97166bb8818e45e49eafc453fd7ab87f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3cd39729 12764430

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

+1 −3
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_A 
import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_ALLOW_GESTURE_IGNORING_BAR_VISIBILITY;

import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_ASSIST_GESTURE_CONSTRAINED;

import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_BUBBLES_EXPANDED;

import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_DEVICE_DREAMING;

import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_DIALOG_SHOWING;

import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_HOME_DISABLED;

import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_IME_SHOWING;
@@ -387,8 +386,7 @@ public class RecentsAnimationDeviceState implements DisplayInfoChangeListener { 
                && (mSystemUiStateFlags & SYSUI_STATE_QUICK_SETTINGS_EXPANDED) == 0

                && (mSystemUiStateFlags & SYSUI_STATE_MAGNIFICATION_OVERLAP) == 0

                && ((mSystemUiStateFlags & SYSUI_STATE_HOME_DISABLED) == 0

                        || (mSystemUiStateFlags & SYSUI_STATE_OVERVIEW_DISABLED) == 0)

                && (mSystemUiStateFlags & SYSUI_STATE_DEVICE_DREAMING) == 0;

                        || (mSystemUiStateFlags & SYSUI_STATE_OVERVIEW_DISABLED) == 0);

    }



    /**