Merge "[CD] Handle trackpad back gestures on connected displays" into main (8102154d) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/navigationbar/TaskbarDelegate.java

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -239,6 +239,7 @@ public class TaskbarDelegate implements CommandQueue.Callbacks,
	@Override		@Override
	public void onDisplayAddSystemDecorations(int displayId) {		public void onDisplayAddSystemDecorations(int displayId) {
	CommandQueue.Callbacks.super.onDisplayAddSystemDecorations(displayId);		CommandQueue.Callbacks.super.onDisplayAddSystemDecorations(displayId);
			mEdgeBackGestureHandler.onDisplayAddSystemDecorations(displayId);
	if (mLauncherProxyService.getProxy() == null) {		if (mLauncherProxyService.getProxy() == null) {
	return;		return;
	}		}
	@@ -253,6 +254,7 @@ public class TaskbarDelegate implements CommandQueue.Callbacks,
	@Override		@Override
	public void onDisplayRemoved(int displayId) {		public void onDisplayRemoved(int displayId) {
	CommandQueue.Callbacks.super.onDisplayRemoved(displayId);		CommandQueue.Callbacks.super.onDisplayRemoved(displayId);
			mEdgeBackGestureHandler.onDisplayRemoveSystemDecorations(displayId);
	if (mLauncherProxyService.getProxy() == null) {		if (mLauncherProxyService.getProxy() == null) {
	return;		return;
	}		}
	@@ -267,6 +269,7 @@ public class TaskbarDelegate implements CommandQueue.Callbacks,
	@Override		@Override
	public void onDisplayRemoveSystemDecorations(int displayId) {		public void onDisplayRemoveSystemDecorations(int displayId) {
	CommandQueue.Callbacks.super.onDisplayRemoveSystemDecorations(displayId);		CommandQueue.Callbacks.super.onDisplayRemoveSystemDecorations(displayId);
			mEdgeBackGestureHandler.onDisplayRemoveSystemDecorations(displayId);
	if (mLauncherProxyService.getProxy() == null) {		if (mLauncherProxyService.getProxy() == null) {
	return;		return;
	}		}

packages/SystemUI/src/com/android/systemui/navigationbar/gestural/EdgeBackGestureHandler.java

+94 −23

Original line number	Original line	Diff line number	Diff line
	@@ -22,6 +22,7 @@ import static android.view.MotionEvent.TOOL_TYPE_FINGER;
	import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_EXCLUDE_FROM_SCREEN_MAGNIFICATION;		import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_EXCLUDE_FROM_SCREEN_MAGNIFICATION;

	import static com.android.systemui.Flags.edgebackGestureHandlerGetRunningTasksBackground;		import static com.android.systemui.Flags.edgebackGestureHandlerGetRunningTasksBackground;
			import static com.android.window.flags.Flags.enableMultidisplayTrackpadBackGesture;
	import static com.android.systemui.Flags.predictiveBackDelayWmTransition;		import static com.android.systemui.Flags.predictiveBackDelayWmTransition;
	import static com.android.systemui.classifier.Classifier.BACK_GESTURE;		import static com.android.systemui.classifier.Classifier.BACK_GESTURE;
	import static com.android.systemui.navigationbar.gestural.Utilities.isTrackpadThreeFingerSwipe;		import static com.android.systemui.navigationbar.gestural.Utilities.isTrackpadThreeFingerSwipe;
	@@ -115,6 +116,8 @@ import kotlinx.coroutines.Job;
	import java.io.PrintWriter;		import java.io.PrintWriter;
	import java.util.ArrayDeque;		import java.util.ArrayDeque;
	import java.util.Date;		import java.util.Date;
			import java.util.HashMap;
			import java.util.Iterator;
	import java.util.Locale;		import java.util.Locale;
	import java.util.Map;		import java.util.Map;
	import java.util.Optional;		import java.util.Optional;
	@@ -279,8 +282,7 @@ public class EdgeBackGestureHandler implements PluginListener<NavigationEdgeBack
	private boolean mIsTrackpadThreeFingerSwipe;		private boolean mIsTrackpadThreeFingerSwipe;
	private boolean mIsButtonForcedVisible;		private boolean mIsButtonForcedVisible;

	private InputMonitorCompat mInputMonitor;		private final Map<Integer, InputMonitorResource> mInputMonitorResources = new HashMap<>();
	private InputChannelCompat.InputEventReceiver mInputEventReceiver;

	private NavigationEdgeBackPlugin mEdgeBackPlugin;		private NavigationEdgeBackPlugin mEdgeBackPlugin;
	private BackAnimation mBackAnimation;		private BackAnimation mBackAnimation;
	@@ -665,14 +667,44 @@ public class EdgeBackGestureHandler implements PluginListener<NavigationEdgeBack
	mIsNavBarShownTransiently = isTransient;		mIsNavBarShownTransiently = isTransient;
	}		}

	private void disposeInputChannel() {		/**
	if (mInputEventReceiver != null) {		* Called when a new display gets connected
	mInputEventReceiver.dispose();		*
	mInputEventReceiver = null;		* @param displayId The id associated with the connected display.
			*/
			public void onDisplayAddSystemDecorations(int displayId) {
			if (enableMultidisplayTrackpadBackGesture() && mIsEnabled) {
			mUiThreadContext.runWithScissors(() -> {
			removeAndDisposeInputMonitorResource(displayId);
			mInputMonitorResources.put(displayId, new InputMonitorResource(displayId));
			});
	}		}
	if (mInputMonitor != null) {		}
	mInputMonitor.dispose();
	mInputMonitor = null;		/**
			* Called when a display gets disconnected
			*
			* @param displayId The id associated with the disconnected display.
			*/
			public void onDisplayRemoveSystemDecorations(int displayId) {
			if (enableMultidisplayTrackpadBackGesture()) {
			mUiThreadContext.runWithScissors(() -> removeAndDisposeInputMonitorResource(displayId));
			}
			}

			private void removeAndDisposeInputMonitorResource(int displayId) {
			InputMonitorResource inputMonitor = mInputMonitorResources.remove(displayId);
			if (inputMonitor != null) {
			inputMonitor.dispose();
			}
			}

			private void disposeInputChannels() {
			Iterator<Map.Entry<Integer, InputMonitorResource>> iterator =
			mInputMonitorResources.entrySet().iterator();
			while (iterator.hasNext()) {
			iterator.next().getValue().dispose();
			iterator.remove();
	}		}
	}		}

	@@ -691,7 +723,7 @@ public class EdgeBackGestureHandler implements PluginListener<NavigationEdgeBack
	return;		return;
	}		}
	mIsEnabled = isEnabled;		mIsEnabled = isEnabled;
	disposeInputChannel();		disposeInputChannels();

	if (mEdgeBackPlugin != null) {		if (mEdgeBackPlugin != null) {
	mEdgeBackPlugin.onDestroy();		mEdgeBackPlugin.onDestroy();
	@@ -746,9 +778,8 @@ public class EdgeBackGestureHandler implements PluginListener<NavigationEdgeBack
	}		}

	// Register input event receiver		// Register input event receiver
	mInputMonitor = new InputMonitorCompat("edge-swipe", mDisplayId);		mInputMonitorResources.put(mDisplayId, new InputMonitorResource(mDisplayId));
	mInputEventReceiver = mInputMonitor.getInputReceiver(mUiThreadContext.getLooper(),		//TODO(b/382774299): Register input monitor on connected displays (if any)
	mUiThreadContext.getChoreographer(), this::onInputEvent);

	// Add a nav bar panel window		// Add a nav bar panel window
	resetEdgeBackPlugin();		resetEdgeBackPlugin();
	@@ -950,9 +981,10 @@ public class EdgeBackGestureHandler implements PluginListener<NavigationEdgeBack
	return true;		return true;
	}		}

	private boolean isValidTrackpadBackGesture(boolean isTrackpadEvent) {		private boolean isValidTrackpadBackGesture(int displayId) {
	if (!isTrackpadEvent) {		if (enableMultidisplayTrackpadBackGesture() && displayId != mDisplayId) {
	return false;		//TODO(b/382774299): Handle exclude regions on connected displays
			return true;
	}		}
	// for trackpad gestures, unless the whole screen is excluded region, 3-finger swipe		// for trackpad gestures, unless the whole screen is excluded region, 3-finger swipe
	// gestures are allowed even if the cursor is in the excluded region.		// gestures are allowed even if the cursor is in the excluded region.
	@@ -969,14 +1001,15 @@ public class EdgeBackGestureHandler implements PluginListener<NavigationEdgeBack

	private boolean isWithinTouchRegion(MotionEvent ev) {		private boolean isWithinTouchRegion(MotionEvent ev) {
	// If the point is inside the PiP or Nav bar overlay excluded bounds, then ignore the back		// If the point is inside the PiP or Nav bar overlay excluded bounds, then ignore the back
	// gesture		// gesture. Also ignore (for now) if it's not on the main display.
			// TODO(b/382130680): Implement back gesture handling on connected displays
	int x = (int) ev.getX();		int x = (int) ev.getX();
	int y = (int) ev.getY();		int y = (int) ev.getY();
	final boolean isInsidePip = mIsInPip && mPipExcludedBounds.contains(x, y);		final boolean isInsidePip = mIsInPip && mPipExcludedBounds.contains(x, y);
	final boolean isInDesktopExcludeRegion = desktopExcludeRegionContains(x, y)		final boolean isInDesktopExcludeRegion = desktopExcludeRegionContains(x, y)
	&& isEdgeResizePermitted(ev);		&& isEdgeResizePermitted(ev);
	if (isInsidePip \|\| isInDesktopExcludeRegion		if (isInsidePip \|\| isInDesktopExcludeRegion
	\|\| mNavBarOverlayExcludedBounds.contains(x, y)) {		\|\| mNavBarOverlayExcludedBounds.contains(x, y) \|\| ev.getDisplayId() != mDisplayId) {
	return false;		return false;
	}		}

	@@ -1076,7 +1109,11 @@ public class EdgeBackGestureHandler implements PluginListener<NavigationEdgeBack

	// Verify if this is in within the touch region and we aren't in immersive mode, and		// Verify if this is in within the touch region and we aren't in immersive mode, and
	// either the bouncer is showing or the notification panel is hidden		// either the bouncer is showing or the notification panel is hidden
	mInputEventReceiver.setBatchingEnabled(false);		InputMonitorResource inputMonitorResource =
			mInputMonitorResources.get(ev.getDisplayId());
			if (inputMonitorResource != null) {
			inputMonitorResource.mInputEventReceiver.setBatchingEnabled(false);
			}
	if (mIsTrackpadThreeFingerSwipe) {		if (mIsTrackpadThreeFingerSwipe) {
	// Since trackpad gestures don't have zones, this will be determined later by the		// Since trackpad gestures don't have zones, this will be determined later by the
	// direction of the gesture. {@code mIsOnLeftEdge} is set to false to begin with.		// direction of the gesture. {@code mIsOnLeftEdge} is set to false to begin with.
	@@ -1099,7 +1136,7 @@ public class EdgeBackGestureHandler implements PluginListener<NavigationEdgeBack
	boolean trackpadGesturesEnabled =		boolean trackpadGesturesEnabled =
	(mSysUiFlags & SYSUI_STATE_TOUCHPAD_GESTURES_DISABLED) == 0;		(mSysUiFlags & SYSUI_STATE_TOUCHPAD_GESTURES_DISABLED) == 0;
	mAllowGesture = isBackAllowedCommon && trackpadGesturesEnabled		mAllowGesture = isBackAllowedCommon && trackpadGesturesEnabled
	&& isValidTrackpadBackGesture(true /* isTrackpadEvent */);		&& isValidTrackpadBackGesture(ev.getDisplayId());
	} else {		} else {
	mAllowGesture = isBackAllowedCommon && !mUsingThreeButtonNav && isWithinInsets		mAllowGesture = isBackAllowedCommon && !mUsingThreeButtonNav && isWithinInsets
	&& isWithinTouchRegion(ev) && !isButtonPressFromTrackpad(ev);		&& isWithinTouchRegion(ev) && !isButtonPressFromTrackpad(ev);
	@@ -1210,12 +1247,14 @@ public class EdgeBackGestureHandler implements PluginListener<NavigationEdgeBack
	}		}

	private void pilferPointers() {		private void pilferPointers() {
	if (mInputMonitor != null) {		//TODO(b/382774299): Pilfer pointers on the correct display
			InputMonitorResource inputMonitorResource = mInputMonitorResources.get(mDisplayId);
			if (inputMonitorResource != null) {
	// Capture inputs		// Capture inputs
	mInputMonitor.pilferPointers();		inputMonitorResource.mInputMonitorCompat.pilferPointers();
	// Notify FalsingManager that an intentional gesture has occurred.		// Notify FalsingManager that an intentional gesture has occurred.
	mFalsingManager.isFalseTouch(BACK_GESTURE);		mFalsingManager.isFalseTouch(BACK_GESTURE);
	mInputEventReceiver.setBatchingEnabled(true);		inputMonitorResource.mInputEventReceiver.setBatchingEnabled(true);
	}		}
	}		}

	@@ -1344,6 +1383,11 @@ public class EdgeBackGestureHandler implements PluginListener<NavigationEdgeBack
	if (mEdgeBackPlugin != null) {		if (mEdgeBackPlugin != null) {
	mEdgeBackPlugin.dump(pw);		mEdgeBackPlugin.dump(pw);
	}		}
			pw.println(" mInputMonitorResources=" + mInputMonitorResources);
			for (Map.Entry<Integer, InputMonitorResource> inputMonitorResource :
			mInputMonitorResources.entrySet()) {
			inputMonitorResource.getValue().dump("\t", pw);
			}
	}		}

	private void updateTopActivityPackageName() {		private void updateTopActivityPackageName() {
	@@ -1376,6 +1420,33 @@ public class EdgeBackGestureHandler implements PluginListener<NavigationEdgeBack
	}		}
	}		}

			private class InputMonitorResource {
			private final int mDisplayId;
			private final InputMonitorCompat mInputMonitorCompat;
			private final InputChannelCompat.InputEventReceiver mInputEventReceiver;

			private InputMonitorResource(int displayId) {
			this.mDisplayId = displayId;
			mInputMonitorCompat = new InputMonitorCompat("edge-swipe", displayId);
			mInputEventReceiver = mInputMonitorCompat.getInputReceiver(mUiThreadContext.getLooper(),
			mUiThreadContext.getChoreographer(), EdgeBackGestureHandler.this::onInputEvent);
			}

			public void dispose() {
			mInputEventReceiver.dispose();
			mInputMonitorCompat.dispose();
			}

			public void dump(String prefix, PrintWriter writer) {
			writer.println(prefix + this);
			}

			@Override
			public String toString() {
			return "InputMonitorResource (displayId=" + mDisplayId + ")";
			}
			}

	private static class LogArray extends ArrayDeque<String> {		private static class LogArray extends ArrayDeque<String> {
	private final int mLength;		private final int mLength;