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

Commit fd1580e3 authored by Yohei Yukawa's avatar Yohei Yukawa
Browse files

Move IInputMethodSession to com.android.internal.inputmethod 

This CL Moves IInputMethodSession from com.android.internal.view to
com.android.internal.inputmethod to be consistent with other
IME-related files.

This CL also moves IInputSessionCallback to
com.android.internal.inputmethod with renaming it to
IInputMethodSessionCallback for consistency.

This is just a renaming CL of implementation details.  There should be
no user/developer observable behavior change in this CL.

Bug: 234882948
Test: presubmit
Change-Id: I87495cbd482dd55005ac8d948f57f32bb016c7d6
parent 2385e516

core/java/android/inputmethodservice/IInputMethodSessionWrapper.java

+1 −1
Original line number Diff line number Diff line
@@ -36,10 +36,10 @@ import android.view.inputmethod.EditorInfo; 
import android.view.inputmethod.ExtractedText;

import android.view.inputmethod.InputMethodSession;



import com.android.internal.inputmethod.IInputMethodSession;

import com.android.internal.inputmethod.IRemoteInputConnection;

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 {

core/java/android/inputmethodservice/IInputMethodWrapper.java

+7 −7
Original line number Diff line number Diff line
@@ -41,14 +41,14 @@ import android.window.ImeOnBackInvokedDispatcher; 


import com.android.internal.inputmethod.CancellationGroup;

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.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.IInputMethodSession;

import com.android.internal.view.IInputSessionCallback;

import com.android.internal.view.InlineSuggestionsRequestInfo;



import java.io.FileDescriptor;
@@ -110,10 +110,10 @@ class IInputMethodWrapper extends IInputMethod.Stub 
    static final class InputMethodSessionCallbackWrapper implements InputMethod.SessionCallback {

        final Context mContext;

        final InputChannel mChannel;

        final IInputSessionCallback mCb;

        final IInputMethodSessionCallback mCb;



        InputMethodSessionCallbackWrapper(Context context, InputChannel channel,

                IInputSessionCallback cb) {

                IInputMethodSessionCallback cb) {

            mContext = context;

            mChannel = channel;

            mCb = cb;
@@ -220,7 +220,7 @@ class IInputMethodWrapper extends IInputMethod.Stub 
                SomeArgs args = (SomeArgs)msg.obj;

                inputMethod.createSession(new InputMethodSessionCallbackWrapper(

                        mContext, (InputChannel) args.arg1,

                        (IInputSessionCallback)args.arg2));

                        (IInputMethodSessionCallback) args.arg2));

                args.recycle();

                return;

            }
@@ -375,7 +375,7 @@ class IInputMethodWrapper extends IInputMethod.Stub 


    @BinderThread

    @Override

    public void createSession(InputChannel channel, IInputSessionCallback callback) {

    public void createSession(InputChannel channel, IInputMethodSessionCallback callback) {

        mCaller.executeOrSendMessage(mCaller.obtainMessageOO(DO_CREATE_SESSION,

                channel, callback));

    }

core/java/android/view/inputmethod/InputMethodManager.java

+1 −1
Original line number Diff line number Diff line
@@ -97,6 +97,7 @@ import android.window.WindowOnBackInvokedDispatcher; 
import com.android.internal.annotations.GuardedBy;

import com.android.internal.inputmethod.DirectBootAwareness;

import com.android.internal.inputmethod.IInputMethodClient;

import com.android.internal.inputmethod.IInputMethodSession;

import com.android.internal.inputmethod.IRemoteAccessibilityInputConnection;

import com.android.internal.inputmethod.ImeTracing;

import com.android.internal.inputmethod.InputBindResult;
@@ -109,7 +110,6 @@ import com.android.internal.inputmethod.StartInputReason; 
import com.android.internal.inputmethod.UnbindReason;

import com.android.internal.os.SomeArgs;

import com.android.internal.view.IInputMethodManager;

import com.android.internal.view.IInputMethodSession;



import java.io.FileDescriptor;

import java.io.PrintWriter;

core/java/android/view/inputmethod/InputMethodSessionWrapper.java

+1 −1
Original line number Diff line number Diff line
@@ -24,8 +24,8 @@ import android.os.Bundle; 
import android.os.RemoteException;

import android.util.Log;



import com.android.internal.inputmethod.IInputMethodSession;

import com.android.internal.inputmethod.IRemoteInputConnection;

import com.android.internal.view.IInputMethodSession;



/**

 * This class wrap the {@link IInputMethodSession} object from {@link InputMethodManager}.

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

+1 −1
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.graphics.Rect;

import android.os.Bundle;