From 1508f37558520567d1fcede363e9815d8e6bbf2e Mon Sep 17 00:00:00 2001 From: Yohei Yukawa Date: Fri, 10 Jun 2022 11:34:30 -0700 Subject: [PATCH] Move IInputMethod to com.android.internal.inputmethod This CL Moves IInputMethod from com.android.internal.view to com.android.internal.inputmethod to be consistent with other IME-related internal files. This is a mechanical refactoring of internal details. There should be no user/developer observable behavior change in this CL. Bug: 234882948 Test: presubmit Change-Id: I1a43c2ad1f932ecb9201b3958becb475fb2d718d --- .../android/inputmethodservice/IInputMethodWrapper.java | 2 +- .../android/inputmethodservice/RemoteInputConnection.java | 3 +-- .../internal/{view => inputmethod}/IInputMethod.aidl | 6 ++---- .../inputmethod/RemoteAccessibilityInputConnection.java | 3 +-- .../com/android/server/inputmethod/IInputMethodInvoker.java | 2 +- .../server/inputmethod/InputMethodBindingController.java | 2 +- .../server/inputmethod/InputMethodManagerService.java | 2 +- 7 files changed, 8 insertions(+), 12 deletions(-) rename core/java/com/android/internal/{view => inputmethod}/IInputMethod.aidl (97%) diff --git a/core/java/android/inputmethodservice/IInputMethodWrapper.java b/core/java/android/inputmethodservice/IInputMethodWrapper.java index 9517f36040b07..f481bca156dfa 100644 --- a/core/java/android/inputmethodservice/IInputMethodWrapper.java +++ b/core/java/android/inputmethodservice/IInputMethodWrapper.java @@ -40,6 +40,7 @@ import android.view.inputmethod.InputMethodSubtype; import android.window.ImeOnBackInvokedDispatcher; import com.android.internal.inputmethod.CancellationGroup; +import com.android.internal.inputmethod.IInputMethod; import com.android.internal.inputmethod.IInputMethodPrivilegedOperations; import com.android.internal.inputmethod.IInputMethodSession; import com.android.internal.inputmethod.IInputMethodSessionCallback; @@ -48,7 +49,6 @@ import com.android.internal.inputmethod.InputMethodNavButtonFlags; import com.android.internal.os.HandlerCaller; import com.android.internal.os.SomeArgs; import com.android.internal.view.IInlineSuggestionsRequestCallback; -import com.android.internal.view.IInputMethod; import com.android.internal.view.InlineSuggestionsRequestInfo; import java.io.FileDescriptor; diff --git a/core/java/android/inputmethodservice/RemoteInputConnection.java b/core/java/android/inputmethodservice/RemoteInputConnection.java index d13da3fb3ce22..26d2d9eb1063b 100644 --- a/core/java/android/inputmethodservice/RemoteInputConnection.java +++ b/core/java/android/inputmethodservice/RemoteInputConnection.java @@ -39,7 +39,6 @@ import com.android.internal.inputmethod.IRemoteInputConnection; import com.android.internal.inputmethod.IRemoteInputConnectionInvoker; import com.android.internal.inputmethod.ImeTracing; import com.android.internal.inputmethod.InputConnectionProtoDumper; -import com.android.internal.view.IInputMethod; import java.lang.ref.WeakReference; import java.util.concurrent.CompletableFuture; @@ -90,7 +89,7 @@ final class RemoteInputConnection implements InputConnection { * Signaled when the system decided to take away IME focus from the target app. * *

This is expected to be signaled immediately when the IME process receives - * {@link IInputMethod#unbindInput()}.

+ * {@link com.android.internal.inputmethod.IInputMethod#unbindInput()}.

*/ @NonNull private final CancellationGroup mCancellationGroup; diff --git a/core/java/com/android/internal/view/IInputMethod.aidl b/core/java/com/android/internal/inputmethod/IInputMethod.aidl similarity index 97% rename from core/java/com/android/internal/view/IInputMethod.aidl rename to core/java/com/android/internal/inputmethod/IInputMethod.aidl index ff1748854f51e..b3aa130179405 100644 --- a/core/java/com/android/internal/view/IInputMethod.aidl +++ b/core/java/com/android/internal/inputmethod/IInputMethod.aidl @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.internal.view; +package com.android.internal.inputmethod; import android.os.IBinder; import android.os.ResultReceiver; @@ -32,9 +32,7 @@ import com.android.internal.view.IInlineSuggestionsRequestCallback; import com.android.internal.view.InlineSuggestionsRequestInfo; /** - * Top-level interface to an input method component (implemented in a - * Service). - * {@hide} + * Top-level interface to an input method component (implemented in a Service). */ oneway interface IInputMethod { void initializeInternal(IBinder token, IInputMethodPrivilegedOperations privOps, diff --git a/core/java/com/android/internal/inputmethod/RemoteAccessibilityInputConnection.java b/core/java/com/android/internal/inputmethod/RemoteAccessibilityInputConnection.java index 0ee8ee7fb4c72..41e2ebd7c1547 100644 --- a/core/java/com/android/internal/inputmethod/RemoteAccessibilityInputConnection.java +++ b/core/java/com/android/internal/inputmethod/RemoteAccessibilityInputConnection.java @@ -26,7 +26,6 @@ import android.view.inputmethod.SurroundingText; import android.view.inputmethod.TextAttribute; import com.android.internal.infra.AndroidFuture; -import com.android.internal.view.IInputMethod; import java.util.concurrent.CompletableFuture; @@ -48,7 +47,7 @@ public final class RemoteAccessibilityInputConnection { * Signaled when the system decided to take away IME focus from the target app. * *

This is expected to be signaled immediately when the IME process receives - * {@link IInputMethod#unbindInput()}.

+ * {@link com.android.internal.inputmethod.IInputMethod#unbindInput()}.

*/ @NonNull private final CancellationGroup mCancellationGroup; diff --git a/services/core/java/com/android/server/inputmethod/IInputMethodInvoker.java b/services/core/java/com/android/server/inputmethod/IInputMethodInvoker.java index 051601c5b3ae9..7606c3e757539 100644 --- a/services/core/java/com/android/server/inputmethod/IInputMethodInvoker.java +++ b/services/core/java/com/android/server/inputmethod/IInputMethodInvoker.java @@ -32,13 +32,13 @@ import android.view.inputmethod.InputBinding; import android.view.inputmethod.InputMethodSubtype; import android.window.ImeOnBackInvokedDispatcher; +import com.android.internal.inputmethod.IInputMethod; import com.android.internal.inputmethod.IInputMethodPrivilegedOperations; import com.android.internal.inputmethod.IInputMethodSession; import com.android.internal.inputmethod.IInputMethodSessionCallback; import com.android.internal.inputmethod.IRemoteInputConnection; import com.android.internal.inputmethod.InputMethodNavButtonFlags; import com.android.internal.view.IInlineSuggestionsRequestCallback; -import com.android.internal.view.IInputMethod; import com.android.internal.view.InlineSuggestionsRequestInfo; import java.util.List; diff --git a/services/core/java/com/android/server/inputmethod/InputMethodBindingController.java b/services/core/java/com/android/server/inputmethod/InputMethodBindingController.java index d9e6f6b50ec3b..9c2368e252267 100644 --- a/services/core/java/com/android/server/inputmethod/InputMethodBindingController.java +++ b/services/core/java/com/android/server/inputmethod/InputMethodBindingController.java @@ -45,9 +45,9 @@ import android.view.inputmethod.InputMethod; import android.view.inputmethod.InputMethodInfo; import com.android.internal.annotations.GuardedBy; +import com.android.internal.inputmethod.IInputMethod; import com.android.internal.inputmethod.InputBindResult; import com.android.internal.inputmethod.UnbindReason; -import com.android.internal.view.IInputMethod; import com.android.server.EventLogTags; import com.android.server.wm.WindowManagerInternal; diff --git a/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java b/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java index 1429f526cc3f5..a8d1496458bca 100644 --- a/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java +++ b/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java @@ -4773,7 +4773,7 @@ public final class InputMethodManagerService extends IInputMethodManager.Stub } } - /** Called right after {@link com.android.internal.view.IInputMethod#showSoftInput}. */ + /** Called right after {@link com.android.internal.inputmethod.IInputMethod#showSoftInput}. */ @GuardedBy("ImfLock.class") private void onShowHideSoftInputRequested(boolean show, IBinder requestToken, @SoftInputShowHideReason int reason) {