Merge "Merge "Fix keyboard focus in VR" into oc-dr1-dev am: 986995d481 am:... (6f6cc83c) · Commits · e / os / android_frameworks_base

core/java/android/inputmethodservice/IInputMethodSessionWrapper.java

+6 −6

Original line number	Diff line number	Diff line
		@@ -16,10 +16,6 @@

		package android.inputmethodservice;

		import com.android.internal.os.HandlerCaller;
		import com.android.internal.os.SomeArgs;
		import com.android.internal.view.IInputMethodSession;

		import android.content.Context;
		import android.graphics.Rect;
		import android.os.Bundle;
		@@ -34,9 +30,13 @@ import android.view.InputEventReceiver;
		import android.view.KeyEvent;
		import android.view.MotionEvent;
		import android.view.inputmethod.CompletionInfo;
		import android.view.inputmethod.CursorAnchorInfo;
		import android.view.inputmethod.ExtractedText;
		import android.view.inputmethod.InputMethodSession;
		import android.view.inputmethod.CursorAnchorInfo;

		import com.android.internal.os.HandlerCaller;
		import com.android.internal.os.SomeArgs;
		import com.android.internal.view.IInputMethodSession;

		class IInputMethodSessionWrapper extends IInputMethodSession.Stub
		implements HandlerCaller.Callback {
		@@ -218,7 +218,7 @@ class IInputMethodSessionWrapper extends IInputMethodSession.Stub
		}

		@Override
		public void onInputEvent(InputEvent event) {
		public void onInputEvent(InputEvent event, int displayId) {
		if (mInputMethodSession == null) {
		// The session has been finished.
		finishInputEvent(event, false);

+1 −1

Original line number	Diff line number	Diff line
		@@ -268,7 +268,7 @@ public abstract class WallpaperService extends Service {
		}

		@Override
		public void onInputEvent(InputEvent event) {
		public void onInputEvent(InputEvent event, int displayId) {
		boolean handled = false;
		try {
		if (event instanceof MotionEvent

+4 −3

Original line number	Diff line number	Diff line
		@@ -111,9 +111,10 @@ public abstract class InputEventReceiver {
		* to indicate whether the event was handled. No new input events will be received
		* until {@link #finishInputEvent} is called.
		*
		* @param displayId The display id on which input event triggered.
		* @param event The input event that was received.
		*/
		public void onInputEvent(InputEvent event) {
		public void onInputEvent(InputEvent event, int displayId) {
		finishInputEvent(event, false);
		}

		@@ -180,9 +181,9 @@ public abstract class InputEventReceiver {

		// Called from native code.
		@SuppressWarnings("unused")
		private void dispatchInputEvent(int seq, InputEvent event) {
		private void dispatchInputEvent(int seq, InputEvent event, int displayId) {
		mSeqMap.put(event.getSequenceNumber(), seq);
		onInputEvent(event);
		onInputEvent(event, displayId);
		}

		// Called from native code.

+1 −1

Original line number	Diff line number	Diff line
		@@ -6752,7 +6752,7 @@ public final class ViewRootImpl implements ViewParent,
		}

		@Override
		public void onInputEvent(InputEvent event) {
		public void onInputEvent(InputEvent event, int displayId) {
		enqueueInputEvent(event, this, 0, true);
		}

+7 −0

Original line number	Diff line number	Diff line
		@@ -347,4 +347,11 @@ public abstract class WindowManagerInternal {
		* Requests the window manager to recompute the windows for accessibility.
		*/
		public abstract void computeWindowsForAccessibility();

		/**
		* Called after virtual display Id is updated by
		* {@link com.android.server.vr.Vr2dDisplay} with a specific
		* {@param vr2dDisplayId}.
		*/
		public abstract void setVr2dDisplayId(int vr2dDisplayId);
		}