From 20ed998a514aeb8f72d8b3ae0f58353cc374f5b0 Mon Sep 17 00:00:00 2001 From: Ats Jenk Date: Thu, 3 Nov 2022 11:48:31 -0700 Subject: [PATCH] Clean up bubbles home gesture flag Flag is enabled by default. Removing as it is no longer used. Bug: 256873558 Test: mp launcher Change-Id: I8cdfde754aec7b683ae9e47aa8861ddc41460a59 --- .../quickstep/TouchInteractionService.java | 28 ++----------------- 1 file changed, 3 insertions(+), 25 deletions(-) diff --git a/quickstep/src/com/android/quickstep/TouchInteractionService.java b/quickstep/src/com/android/quickstep/TouchInteractionService.java index 4cdb5f8d12..450774bee7 100644 --- a/quickstep/src/com/android/quickstep/TouchInteractionService.java +++ b/quickstep/src/com/android/quickstep/TouchInteractionService.java @@ -55,7 +55,6 @@ 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; @@ -138,9 +137,6 @@ 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", true); - private static final String HAS_ENABLED_QUICKSTEP_ONCE = "launcher.has_enabled_quickstep_once"; private final TISBinder mTISBinder = new TISBinder(); @@ -809,27 +805,9 @@ public class TouchInteractionService extends Service if (mDeviceState.isBubblesExpanded()) { reasonString = newCompoundString(reasonPrefix) .append(SUBSTRING_PREFIX) - .append("bubbles expanded"); - if (BUBBLES_HOME_GESTURE_ENABLED) { - reasonString.append(SUBSTRING_PREFIX) - .append("bubbles can handle the home gesture") - .append(", trying to use default input consumer"); - // Bubbles can handle home gesture itself. - base = getDefaultInputConsumer(reasonString); - } 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.isNotificationPanelExpanded()) { - reasonString = newCompoundString(reasonPrefix) - .append(SUBSTRING_PREFIX) - .append("using SysUiOverlayInputConsumer"); - base = new SysUiOverlayInputConsumer( - getBaseContext(), mDeviceState, mInputMonitorCompat); - } - } + .append("bubbles expanded, trying to use default input consumer"); + // Bubbles can handle home gesture itself. + base = getDefaultInputConsumer(reasonString); } if (mDeviceState.isSystemUiDialogShowing()) {