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

Commit 07c3d0ec authored by Ats Jenk's avatar Ats Jenk Committed by Automerger Merge Worker
Browse files

Merge "Suppress home gesture when bubbles are expanded" into tm-qpr-dev am:... 

Merge "Suppress home gesture when bubbles are expanded" into tm-qpr-dev am: 6b9fad35 am: 76f9125d

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



Change-Id: I5eea8091355590a42430ffd2e28979fd68b6f780
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 95a731bd 76f9125d

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

+24 −6
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ import android.os.Bundle; 
import android.os.IBinder;

import android.os.Looper;

import android.os.SystemClock;

import android.os.SystemProperties;

import android.util.Log;

import android.view.Choreographer;

import android.view.InputEvent;
@@ -127,6 +128,9 @@ public class TouchInteractionService extends Service 


    private static final String TAG = "TouchInteractionService";



    private static final boolean BUBBLES_HOME_GESTURE_ENABLED =

            SystemProperties.getBoolean("persist.wm.debug.bubbles_home_gesture", false);



    private static final String KEY_BACK_NOTIFICATION_COUNT = "backNotificationCount";

    private static final String NOTIFY_ACTION_BACK = "com.android.quickstep.action.BACK_GESTURE";

    private static final String HAS_ENABLED_QUICKSTEP_ONCE = "launcher.has_enabled_quickstep_once";
@@ -698,15 +702,29 @@ public class TouchInteractionService extends Service 
                base = new TaskbarStashInputConsumer(this, base, mInputMonitorCompat, tac);

            }



            // 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()) {

                if (BUBBLES_HOME_GESTURE_ENABLED) {

                    // Bubbles can handle home gesture itself.

                    base = getDefaultInputConsumer();

                } else {

                    // 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.

                    // Notification panel can be expanded on top of expanded bubbles. Bubbles remain

            // expanded in the back. Make sure swipe up is not passed to bubbles in this case.

            if ((mDeviceState.isBubblesExpanded() && !mDeviceState.isNotificationPanelExpanded())

                    || mDeviceState.isSystemUiDialogShowing()) {

                    // expanded in the back. Make sure swipe up is not passed to bubbles in this

                    // case.

                    if (!mDeviceState.isNotificationPanelExpanded()) {

                        base = new SysUiOverlayInputConsumer(

                                getBaseContext(), mDeviceState, mInputMonitorCompat);

                    }

                }

            }



            if (mDeviceState.isSystemUiDialogShowing()) {

                base = new SysUiOverlayInputConsumer(

                        getBaseContext(), mDeviceState, mInputMonitorCompat);

            }







            if (mDeviceState.isScreenPinningActive()) {

                // Note: we only allow accessibility to wrap this, and it replaces the previous