From bd8375b35ac77d87fd1f865cdbb701b6e6ab7f7d Mon Sep 17 00:00:00 2001 From: Yohei Yukawa Date: Fri, 10 Jun 2022 11:35:05 -0700 Subject: [PATCH] Move *InlineSuggestions* to com.android.internal.inputmethod This CL moves 4 files that match *InlineSuggestions* from com.android.internal.view to com.android.internal.inputmethod as they are basically used only by IME classes (and Autofill). Hopefully this gives better code organization and maintainance. 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: Iac696ae501953ab6a90d99112a62221454cd76e4 --- .../android/inputmethodservice/IInputMethodWrapper.java | 4 ++-- .../android/inputmethodservice/InlineSuggestionSession.java | 6 +++--- .../InlineSuggestionSessionController.java | 4 ++-- .../java/android/inputmethodservice/InputMethodService.java | 4 ++-- core/java/android/view/inputmethod/InputMethod.java | 4 ++-- .../IInlineSuggestionsRequestCallback.aidl | 5 ++--- .../IInlineSuggestionsResponseCallback.aidl | 3 +-- .../java/com/android/internal/inputmethod/IInputMethod.aidl | 4 ++-- .../{view => inputmethod}/InlineSuggestionsRequestInfo.aidl | 2 +- .../{view => inputmethod}/InlineSuggestionsRequestInfo.java | 6 +++--- .../autofill/AutofillInlineSuggestionsRequestSession.java | 6 +++--- .../com/android/server/inputmethod/IInputMethodInvoker.java | 4 ++-- .../server/inputmethod/InputMethodManagerInternal.java | 4 ++-- .../server/inputmethod/InputMethodManagerService.java | 6 +++--- 14 files changed, 30 insertions(+), 32 deletions(-) rename core/java/com/android/internal/{view => inputmethod}/IInlineSuggestionsRequestCallback.aidl (96%) rename core/java/com/android/internal/{view => inputmethod}/IInlineSuggestionsResponseCallback.aidl (95%) rename core/java/com/android/internal/{view => inputmethod}/InlineSuggestionsRequestInfo.aidl (94%) rename core/java/com/android/internal/{view => inputmethod}/InlineSuggestionsRequestInfo.java (98%) diff --git a/core/java/android/inputmethodservice/IInputMethodWrapper.java b/core/java/android/inputmethodservice/IInputMethodWrapper.java index f481bca156dfa..ee34ffe33ff66 100644 --- a/core/java/android/inputmethodservice/IInputMethodWrapper.java +++ b/core/java/android/inputmethodservice/IInputMethodWrapper.java @@ -40,16 +40,16 @@ import android.view.inputmethod.InputMethodSubtype; import android.window.ImeOnBackInvokedDispatcher; import com.android.internal.inputmethod.CancellationGroup; +import com.android.internal.inputmethod.IInlineSuggestionsRequestCallback; 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.InlineSuggestionsRequestInfo; 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.InlineSuggestionsRequestInfo; import java.io.FileDescriptor; import java.io.PrintWriter; diff --git a/core/java/android/inputmethodservice/InlineSuggestionSession.java b/core/java/android/inputmethodservice/InlineSuggestionSession.java index 20bf6e0024e3d..1cc64f9edc122 100644 --- a/core/java/android/inputmethodservice/InlineSuggestionSession.java +++ b/core/java/android/inputmethodservice/InlineSuggestionSession.java @@ -33,9 +33,9 @@ import android.view.autofill.AutofillId; import android.view.inputmethod.InlineSuggestionsRequest; import android.view.inputmethod.InlineSuggestionsResponse; -import com.android.internal.view.IInlineSuggestionsRequestCallback; -import com.android.internal.view.IInlineSuggestionsResponseCallback; -import com.android.internal.view.InlineSuggestionsRequestInfo; +import com.android.internal.inputmethod.IInlineSuggestionsRequestCallback; +import com.android.internal.inputmethod.IInlineSuggestionsResponseCallback; +import com.android.internal.inputmethod.InlineSuggestionsRequestInfo; import java.lang.ref.WeakReference; import java.util.Collections; diff --git a/core/java/android/inputmethodservice/InlineSuggestionSessionController.java b/core/java/android/inputmethodservice/InlineSuggestionSessionController.java index 071c096ee2f01..091a136a77d21 100644 --- a/core/java/android/inputmethodservice/InlineSuggestionSessionController.java +++ b/core/java/android/inputmethodservice/InlineSuggestionSessionController.java @@ -32,8 +32,8 @@ import android.view.inputmethod.EditorInfo; import android.view.inputmethod.InlineSuggestionsRequest; import android.view.inputmethod.InlineSuggestionsResponse; -import com.android.internal.view.IInlineSuggestionsRequestCallback; -import com.android.internal.view.InlineSuggestionsRequestInfo; +import com.android.internal.inputmethod.IInlineSuggestionsRequestCallback; +import com.android.internal.inputmethod.InlineSuggestionsRequestInfo; import java.util.function.Consumer; import java.util.function.Function; diff --git a/core/java/android/inputmethodservice/InputMethodService.java b/core/java/android/inputmethodservice/InputMethodService.java index ae1e7ff41f23c..a1664d8ba47ff 100644 --- a/core/java/android/inputmethodservice/InputMethodService.java +++ b/core/java/android/inputmethodservice/InputMethodService.java @@ -141,17 +141,17 @@ import android.window.OnBackInvokedDispatcher; import android.window.WindowMetricsHelper; import com.android.internal.annotations.GuardedBy; +import com.android.internal.inputmethod.IInlineSuggestionsRequestCallback; import com.android.internal.inputmethod.IInputContentUriToken; import com.android.internal.inputmethod.IInputMethodPrivilegedOperations; import com.android.internal.inputmethod.IRemoteInputConnection; import com.android.internal.inputmethod.ImeTracing; +import com.android.internal.inputmethod.InlineSuggestionsRequestInfo; import com.android.internal.inputmethod.InputMethodNavButtonFlags; import com.android.internal.inputmethod.InputMethodPrivilegedOperations; import com.android.internal.inputmethod.InputMethodPrivilegedOperationsRegistry; import com.android.internal.inputmethod.SoftInputShowHideReason; import com.android.internal.util.RingBuffer; -import com.android.internal.view.IInlineSuggestionsRequestCallback; -import com.android.internal.view.InlineSuggestionsRequestInfo; import java.io.FileDescriptor; import java.io.PrintWriter; diff --git a/core/java/android/view/inputmethod/InputMethod.java b/core/java/android/view/inputmethod/InputMethod.java index dbdc0daff2c1b..827c3ceb07b3d 100644 --- a/core/java/android/view/inputmethod/InputMethod.java +++ b/core/java/android/view/inputmethod/InputMethod.java @@ -31,10 +31,10 @@ import android.view.MotionEvent; import android.view.View; import android.window.ImeOnBackInvokedDispatcher; +import com.android.internal.inputmethod.IInlineSuggestionsRequestCallback; import com.android.internal.inputmethod.IInputMethodPrivilegedOperations; +import com.android.internal.inputmethod.InlineSuggestionsRequestInfo; import com.android.internal.inputmethod.InputMethodNavButtonFlags; -import com.android.internal.view.IInlineSuggestionsRequestCallback; -import com.android.internal.view.InlineSuggestionsRequestInfo; import java.util.List; diff --git a/core/java/com/android/internal/view/IInlineSuggestionsRequestCallback.aidl b/core/java/com/android/internal/inputmethod/IInlineSuggestionsRequestCallback.aidl similarity index 96% rename from core/java/com/android/internal/view/IInlineSuggestionsRequestCallback.aidl rename to core/java/com/android/internal/inputmethod/IInlineSuggestionsRequestCallback.aidl index 6c97962ac0572..49d2b356ec7f7 100644 --- a/core/java/com/android/internal/view/IInlineSuggestionsRequestCallback.aidl +++ b/core/java/com/android/internal/inputmethod/IInlineSuggestionsRequestCallback.aidl @@ -14,17 +14,16 @@ * limitations under the License. */ -package com.android.internal.view; +package com.android.internal.inputmethod; import android.view.autofill.AutofillId; import android.view.inputmethod.InlineSuggestionsRequest; -import com.android.internal.view.IInlineSuggestionsResponseCallback; +import com.android.internal.inputmethod.IInlineSuggestionsResponseCallback; /** * Binder interface for the IME service to send {@link InlineSuggestionsRequest} or notify other IME * service events to the system. - * {@hide} */ oneway interface IInlineSuggestionsRequestCallback { /** Indicates that the current IME does not support inline suggestion. */ diff --git a/core/java/com/android/internal/view/IInlineSuggestionsResponseCallback.aidl b/core/java/com/android/internal/inputmethod/IInlineSuggestionsResponseCallback.aidl similarity index 95% rename from core/java/com/android/internal/view/IInlineSuggestionsResponseCallback.aidl rename to core/java/com/android/internal/inputmethod/IInlineSuggestionsResponseCallback.aidl index 5a78e0d3082df..6f3ff508ca4cc 100644 --- a/core/java/com/android/internal/view/IInlineSuggestionsResponseCallback.aidl +++ b/core/java/com/android/internal/inputmethod/IInlineSuggestionsResponseCallback.aidl @@ -14,14 +14,13 @@ * limitations under the License. */ -package com.android.internal.view; +package com.android.internal.inputmethod; import android.view.autofill.AutofillId; import android.view.inputmethod.InlineSuggestionsResponse; /** * Binder interface for the IME service to receive an inline suggestion response from the system. - * {@hide} */ oneway interface IInlineSuggestionsResponseCallback { void onInlineSuggestionsResponse(in AutofillId fieldId, in InlineSuggestionsResponse response); diff --git a/core/java/com/android/internal/inputmethod/IInputMethod.aidl b/core/java/com/android/internal/inputmethod/IInputMethod.aidl index b3aa130179405..49eafd0176879 100644 --- a/core/java/com/android/internal/inputmethod/IInputMethod.aidl +++ b/core/java/com/android/internal/inputmethod/IInputMethod.aidl @@ -24,12 +24,12 @@ import android.view.inputmethod.EditorInfo; import android.view.inputmethod.InputBinding; import android.view.inputmethod.InputMethodSubtype; import android.window.ImeOnBackInvokedDispatcher; +import com.android.internal.inputmethod.IInlineSuggestionsRequestCallback; 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.view.IInlineSuggestionsRequestCallback; -import com.android.internal.view.InlineSuggestionsRequestInfo; +import com.android.internal.inputmethod.InlineSuggestionsRequestInfo; /** * Top-level interface to an input method component (implemented in a Service). diff --git a/core/java/com/android/internal/view/InlineSuggestionsRequestInfo.aidl b/core/java/com/android/internal/inputmethod/InlineSuggestionsRequestInfo.aidl similarity index 94% rename from core/java/com/android/internal/view/InlineSuggestionsRequestInfo.aidl rename to core/java/com/android/internal/inputmethod/InlineSuggestionsRequestInfo.aidl index 8125c0df219ba..b0be26e46536f 100644 --- a/core/java/com/android/internal/view/InlineSuggestionsRequestInfo.aidl +++ b/core/java/com/android/internal/inputmethod/InlineSuggestionsRequestInfo.aidl @@ -14,6 +14,6 @@ * limitations under the License. */ -package com.android.internal.view; +package com.android.internal.inputmethod; parcelable InlineSuggestionsRequestInfo; diff --git a/core/java/com/android/internal/view/InlineSuggestionsRequestInfo.java b/core/java/com/android/internal/inputmethod/InlineSuggestionsRequestInfo.java similarity index 98% rename from core/java/com/android/internal/view/InlineSuggestionsRequestInfo.java rename to core/java/com/android/internal/inputmethod/InlineSuggestionsRequestInfo.java index 61484906269e1..cdc4631e9edb7 100644 --- a/core/java/com/android/internal/view/InlineSuggestionsRequestInfo.java +++ b/core/java/com/android/internal/inputmethod/InlineSuggestionsRequestInfo.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.internal.view; +package com.android.internal.inputmethod; import android.annotation.NonNull; import android.content.ComponentName; @@ -58,7 +58,7 @@ public final class InlineSuggestionsRequestInfo implements Parcelable { // CHECKSTYLE:OFF Generated code // // To regenerate run: - // $ codegen $ANDROID_BUILD_TOP/frameworks/base/core/java/com/android/internal/view/InlineSuggestionsRequestInfo.java + // $ codegen $ANDROID_BUILD_TOP/frameworks/base/core/java/com/android/internal/inputmethod/InlineSuggestionsRequestInfo.java // // To exclude the generated code from IntelliJ auto-formatting enable (one-time): // Settings > Editor > Code Style > Formatter Control @@ -217,7 +217,7 @@ public final class InlineSuggestionsRequestInfo implements Parcelable { @DataClass.Generated( time = 1582076613213L, codegenVersion = "1.0.14", - sourceFile = "frameworks/base/core/java/com/android/internal/view/InlineSuggestionsRequestInfo.java", + sourceFile = "frameworks/base/core/java/com/android/internal/inputmethod/InlineSuggestionsRequestInfo.java", inputSignatures = "private final @android.annotation.NonNull android.content.ComponentName mComponentName\nprivate final @android.annotation.NonNull android.view.autofill.AutofillId mAutofillId\nprivate final @android.annotation.NonNull android.os.Bundle mUiExtras\nclass InlineSuggestionsRequestInfo extends java.lang.Object implements [android.os.Parcelable]\n@com.android.internal.util.DataClass(genToString=true, genHiddenConstDefs=true, genEqualsHashCode=true)") @Deprecated private void __metadata() {} diff --git a/services/autofill/java/com/android/server/autofill/AutofillInlineSuggestionsRequestSession.java b/services/autofill/java/com/android/server/autofill/AutofillInlineSuggestionsRequestSession.java index 84fbe9a75a18f..a089f3ddcb86b 100644 --- a/services/autofill/java/com/android/server/autofill/AutofillInlineSuggestionsRequestSession.java +++ b/services/autofill/java/com/android/server/autofill/AutofillInlineSuggestionsRequestSession.java @@ -34,9 +34,9 @@ import android.view.inputmethod.InlineSuggestionsRequest; import android.view.inputmethod.InlineSuggestionsResponse; import com.android.internal.annotations.GuardedBy; -import com.android.internal.view.IInlineSuggestionsRequestCallback; -import com.android.internal.view.IInlineSuggestionsResponseCallback; -import com.android.internal.view.InlineSuggestionsRequestInfo; +import com.android.internal.inputmethod.IInlineSuggestionsRequestCallback; +import com.android.internal.inputmethod.IInlineSuggestionsResponseCallback; +import com.android.internal.inputmethod.InlineSuggestionsRequestInfo; import com.android.server.autofill.ui.InlineFillUi; import com.android.server.inputmethod.InputMethodManagerInternal; diff --git a/services/core/java/com/android/server/inputmethod/IInputMethodInvoker.java b/services/core/java/com/android/server/inputmethod/IInputMethodInvoker.java index 7606c3e757539..0186fe5c357c3 100644 --- a/services/core/java/com/android/server/inputmethod/IInputMethodInvoker.java +++ b/services/core/java/com/android/server/inputmethod/IInputMethodInvoker.java @@ -32,14 +32,14 @@ import android.view.inputmethod.InputBinding; import android.view.inputmethod.InputMethodSubtype; import android.window.ImeOnBackInvokedDispatcher; +import com.android.internal.inputmethod.IInlineSuggestionsRequestCallback; 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.InlineSuggestionsRequestInfo; import com.android.internal.inputmethod.InputMethodNavButtonFlags; -import com.android.internal.view.IInlineSuggestionsRequestCallback; -import com.android.internal.view.InlineSuggestionsRequestInfo; import java.util.List; diff --git a/services/core/java/com/android/server/inputmethod/InputMethodManagerInternal.java b/services/core/java/com/android/server/inputmethod/InputMethodManagerInternal.java index 08420a1822e04..428674c16164b 100644 --- a/services/core/java/com/android/server/inputmethod/InputMethodManagerInternal.java +++ b/services/core/java/com/android/server/inputmethod/InputMethodManagerInternal.java @@ -25,9 +25,9 @@ import android.view.inputmethod.InlineSuggestionsRequest; import android.view.inputmethod.InputMethodInfo; import com.android.internal.inputmethod.IAccessibilityInputMethodSession; +import com.android.internal.inputmethod.IInlineSuggestionsRequestCallback; +import com.android.internal.inputmethod.InlineSuggestionsRequestInfo; import com.android.internal.inputmethod.SoftInputShowHideReason; -import com.android.internal.view.IInlineSuggestionsRequestCallback; -import com.android.internal.view.InlineSuggestionsRequestInfo; import com.android.server.LocalServices; import java.util.Collections; diff --git a/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java b/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java index a8d1496458bca..c64445f3cc2f1 100644 --- a/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java +++ b/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java @@ -156,6 +156,8 @@ import com.android.internal.content.PackageMonitor; import com.android.internal.infra.AndroidFuture; import com.android.internal.inputmethod.DirectBootAwareness; import com.android.internal.inputmethod.IAccessibilityInputMethodSession; +import com.android.internal.inputmethod.IInlineSuggestionsRequestCallback; +import com.android.internal.inputmethod.IInlineSuggestionsResponseCallback; import com.android.internal.inputmethod.IInputContentUriToken; import com.android.internal.inputmethod.IInputMethodClient; import com.android.internal.inputmethod.IInputMethodPrivilegedOperations; @@ -164,6 +166,7 @@ import com.android.internal.inputmethod.IInputMethodSessionCallback; import com.android.internal.inputmethod.IRemoteAccessibilityInputConnection; import com.android.internal.inputmethod.IRemoteInputConnection; import com.android.internal.inputmethod.ImeTracing; +import com.android.internal.inputmethod.InlineSuggestionsRequestInfo; import com.android.internal.inputmethod.InputBindResult; import com.android.internal.inputmethod.InputMethodDebug; import com.android.internal.inputmethod.InputMethodNavButtonFlags; @@ -177,10 +180,7 @@ import com.android.internal.os.SomeArgs; import com.android.internal.os.TransferPipe; import com.android.internal.util.ConcurrentUtils; import com.android.internal.util.DumpUtils; -import com.android.internal.view.IInlineSuggestionsRequestCallback; -import com.android.internal.view.IInlineSuggestionsResponseCallback; import com.android.internal.view.IInputMethodManager; -import com.android.internal.view.InlineSuggestionsRequestInfo; import com.android.server.AccessibilityManagerInternal; import com.android.server.EventLogTags; import com.android.server.LocalServices;