Merge "Allow swipe up to dismiss global actions dialog" into ub-launcher3-rvc-dev (1bf23da7) · Commits · e / os / android_packages_apps_Trebuchet

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -609,7 +609,7 @@ public class TouchInteractionService extends Service implements PluginListener<O

		// 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 (mDeviceState.isBubblesExpanded() \|\| mDeviceState.isGlobalActionsShowing()) {
		base = new SysUiOverlayInputConsumer(
		getBaseContext(), mDeviceState, mInputMonitorCompat);
		}

+8 −0

Original line number	Diff line number	Diff line
		@@ -27,6 +27,7 @@ import static com.android.quickstep.util.RecentsOrientedState.isFixedRotationTra
		import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_A11Y_BUTTON_CLICKABLE;
		import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_A11Y_BUTTON_LONG_CLICKABLE;
		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_HOME_DISABLED;
		import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_NAV_BAR_HIDDEN;
		import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_NOTIFICATION_PANEL_EXPANDED;
		@@ -412,6 +413,13 @@ public class RecentsAnimationDeviceState implements
		return (mSystemUiStateFlags & SYSUI_STATE_BUBBLES_EXPANDED) != 0;
		}

		/**
		* @return whether the global actions dialog is showing
		*/
		public boolean isGlobalActionsShowing() {
		return (mSystemUiStateFlags & SYSUI_STATE_GLOBAL_ACTIONS_SHOWING) != 0;
		}

		/**
		* @return whether lock-task mode is active
		*/