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

Commit 78ef3a53 authored by Jordan Demeulenaere's avatar Jordan Demeulenaere
Browse files

Enable back gesture when a SyUI dialog is showing (2/2) 

Test: Manual
Bug: 210270549
Change-Id: I8fbf9a90287cbd8d9ddad354e24bbc4d074bd0ef
parent e424f57d

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

+3 −3
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ 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_GLOBAL_ACTIONS_SHOWING;

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;

import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_MAGNIFICATION_OVERLAP;
@@ -453,8 +453,8 @@ public class RecentsAnimationDeviceState implements 
    /**

     * @return whether the global actions dialog is showing

     */

    public boolean isGlobalActionsShowing() {

        return (mSystemUiStateFlags & SYSUI_STATE_GLOBAL_ACTIONS_SHOWING) != 0;

    public boolean isSystemUiDialogShowing() {

        return (mSystemUiStateFlags & SYSUI_STATE_DIALOG_SHOWING) != 0;

    }



    /**

quickstep/src/com/android/quickstep/TouchInteractionService.java

+1 −1
Original line number Diff line number Diff line
@@ -701,7 +701,7 @@ public class TouchInteractionService extends Service 


            // If Bubbles is expanded, use the overlay input consumer, which will close Bubbles

            // instead of going all the way home when a swipe up is detected.

            if (mDeviceState.isBubblesExpanded() || mDeviceState.isGlobalActionsShowing()) {

            if (mDeviceState.isBubblesExpanded() || mDeviceState.isSystemUiDialogShowing()) {

                base = new SysUiOverlayInputConsumer(

                        getBaseContext(), mDeviceState, mInputMonitorCompat);

            }