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

Commit 1508f375 authored by Yohei Yukawa's avatar Yohei Yukawa
Browse files

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
parent fd1580e3

core/java/android/inputmethodservice/IInputMethodWrapper.java

+1 −1
Original line number Diff line number Diff line
@@ -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;

core/java/android/inputmethodservice/RemoteInputConnection.java

+1 −2
Original line number Diff line number Diff line
@@ -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.

     *

     * <p>This is expected to be signaled immediately when the IME process receives

     * {@link IInputMethod#unbindInput()}.</p>

     * {@link com.android.internal.inputmethod.IInputMethod#unbindInput()}.</p>

     */

    @NonNull

    private final CancellationGroup mCancellationGroup;

core/java/com/android/internal/view/IInputMethod.aidl→core/java/com/android/internal/inputmethod/IInputMethod.aidl

+2 −4
Original line number Diff line number Diff line
@@ -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,

core/java/com/android/internal/inputmethod/RemoteAccessibilityInputConnection.java

+1 −2
Original line number Diff line number Diff line
@@ -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.

     *

     * <p>This is expected to be signaled immediately when the IME process receives

     * {@link IInputMethod#unbindInput()}.</p>

     * {@link com.android.internal.inputmethod.IInputMethod#unbindInput()}.</p>

     */

    @NonNull

    private final CancellationGroup mCancellationGroup;

services/core/java/com/android/server/inputmethod/IInputMethodInvoker.java

+1 −1
Original line number Diff line number Diff line
@@ -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;