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

Commit c5248ade authored Sep 11, 2017 by Tarandeep Singh Committed by Android (Google) Code Review Sep 11, 2017

Merge "Enhance IME support in ActivityView for AAe."

parents 097ab6be 7ac8d3a2

services/core/java/com/android/server/wm/DisplayContent.java

+7 −3

Original line number	Diff line number	Diff line
		@@ -1915,10 +1915,14 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo
		super.removeImmediately();
		if (DEBUG_DISPLAY) Slog.v(TAG_WM, "Removing display=" + this);
		mDimLayerController.close();
		if (mDisplayId == DEFAULT_DISPLAY && mService.canDispatchPointerEvents()) {
		if (mService.canDispatchPointerEvents()) {
		if (mTapDetector != null) {
		mService.unregisterPointerEventListener(mTapDetector);
		}
		if (mDisplayId == DEFAULT_DISPLAY && mService.mMousePositionTracker != null) {
		mService.unregisterPointerEventListener(mService.mMousePositionTracker);
		}
		}
		} finally {
		mRemovingDisplay = false;
		}

services/core/java/com/android/server/wm/RootWindowContainer.java

+2 −7

Original line number	Diff line number	Diff line
		@@ -249,13 +249,8 @@ class RootWindowContainer extends WindowContainer<DisplayContent> {

		// Tap Listeners are supported for:
		// 1. All physical displays (multi-display).
		// 2. VirtualDisplays that support virtual touch input. (Only VR for now)
		// TODO(multi-display): Support VirtualDisplays with no virtual touch input.
		if ((display.getType() != Display.TYPE_VIRTUAL
		\|\| (display.getType() == Display.TYPE_VIRTUAL
		// Only VR VirtualDisplays
		&& displayId == mService.mVr2dDisplayId))
		&& mService.canDispatchPointerEvents()) {
		// 2. VirtualDisplays on VR, AA (and everything else).
		if (mService.canDispatchPointerEvents()) {
		if (DEBUG_DISPLAY) {
		Slog.d(TAG,
		"Registering PointerEventListener for DisplayId: " + displayId);