Merge "Create bubbles input consumer before nav bar long press" into main (ca996539) · Commits · e / os / android_packages_apps_Trebuchet

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

+21 −6

Original line number	Diff line number	Diff line
		@@ -47,6 +47,7 @@ import static com.android.systemui.shared.system.QuickStepContract.KEY_EXTRA_UNF
		import static com.android.systemui.shared.system.QuickStepContract.KEY_EXTRA_UNLOCK_ANIMATION_CONTROLLER;
		import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_NOTIFICATION_PANEL_EXPANDED;
		import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_QUICK_SETTINGS_EXPANDED;
		import static com.android.wm.shell.Flags.enableBubblesLongPressNavHandle;
		import static com.android.wm.shell.sysui.ShellSharedConstants.KEY_EXTRA_SHELL_BACK_ANIMATION;
		import static com.android.wm.shell.sysui.ShellSharedConstants.KEY_EXTRA_SHELL_BUBBLES;
		import static com.android.wm.shell.sysui.ShellSharedConstants.KEY_EXTRA_SHELL_DESKTOP_MODE;
		@@ -1006,6 +1007,17 @@ public class TouchInteractionService extends Service {
		mOverviewCommandHelper);
		}
		}
		if (enableBubblesLongPressNavHandle()) {
		// Create bubbles input consumer before NavHandleLongPressInputConsumer.
		// This allows for nav handle to fall back to bubbles.
		if (mDeviceState.isBubblesExpanded()) {
		reasonString = newCompoundString(reasonPrefix)
		.append(SUBSTRING_PREFIX)
		.append("bubbles expanded, trying to use default input consumer");
		// Bubbles can handle home gesture itself.
		base = getDefaultInputConsumer(reasonString);
		}
		}

		NavHandle navHandle = tac != null ? tac.getNavHandle()
		: SystemUiProxy.INSTANCE.get(this);
		@@ -1023,6 +1035,8 @@ public class TouchInteractionService extends Service {
		mDeviceState, navHandle);
		}

		if (!enableBubblesLongPressNavHandle()) {
		// Continue overriding nav handle input consumer with bubbles
		if (mDeviceState.isBubblesExpanded()) {
		reasonString = newCompoundString(reasonPrefix)
		.append(SUBSTRING_PREFIX)
		@@ -1030,6 +1044,7 @@ public class TouchInteractionService extends Service {
		// Bubbles can handle home gesture itself.
		base = getDefaultInputConsumer(reasonString);
		}
		}

		if (mDeviceState.isSystemUiDialogShowing()) {
		reasonString = newCompoundString(reasonPrefix)