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

Commit bf586908 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Move IInputMethodClient to com.android.internal.inputmethod"

parents d480badd 32212376

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

+1 −1
Original line number Diff line number Diff line
@@ -96,6 +96,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.IRemoteAccessibilityInputConnection;

import com.android.internal.inputmethod.ImeTracing;

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

import com.android.internal.os.SomeArgs;

import com.android.internal.view.IInputContext;

import com.android.internal.view.IInputMethodClient;

import com.android.internal.view.IInputMethodManager;

import com.android.internal.view.IInputMethodSession;

core/java/com/android/internal/view/IInputMethodClient.aidl→core/java/com/android/internal/inputmethod/IInputMethodClient.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 com.android.internal.inputmethod.InputBindResult;

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

+2 −1
Original line number Diff line number Diff line
@@ -185,7 +185,8 @@ public @interface SoftInputShowHideReason { 
    int HIDE_SAME_WINDOW_FOCUSED_WITHOUT_EDITOR = 20;



    /**

     * Hide soft input when a {@link com.android.internal.view.IInputMethodClient} is removed.

     * Hide soft input when a {@link com.android.internal.inputmethod.IInputMethodClient} is

     * removed.

     */

    int HIDE_REMOVE_CLIENT = 21;

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

+6 −5
Original line number Diff line number Diff line
@@ -75,22 +75,22 @@ public @interface StartInputReason { 
    int CHECK_FOCUS = 5;

    /**

     * {@link android.view.inputmethod.InputMethodManager} is responding to

     * {@link com.android.internal.view.IInputMethodClient#onBindMethod}.

     * {@link com.android.internal.inputmethod.IInputMethodClient#onBindMethod}.

     */

    int BOUND_TO_IMMS = 6;

    /**

     * {@link android.view.inputmethod.InputMethodManager} is responding to

     * {@link com.android.internal.view.IInputMethodClient#onUnbindMethod}.

     * {@link com.android.internal.inputmethod.IInputMethodClient#onUnbindMethod}.

     */

    int UNBOUND_FROM_IMMS = 7;

    /**

     * {@link android.view.inputmethod.InputMethodManager} is responding to

     * {@link com.android.internal.view.IInputMethodClient#setActive}.

     * {@link com.android.internal.inputmethod.IInputMethodClient#setActive}.

     */

    int ACTIVATED_BY_IMMS = 8;

    /**

     * {@link android.view.inputmethod.InputMethodManager} is responding to

     * {@link com.android.internal.view.IInputMethodClient#setActive}.

     * {@link com.android.internal.inputmethod.IInputMethodClient#setActive}.

     */

    int DEACTIVATED_BY_IMMS = 9;

    /**
@@ -105,7 +105,8 @@ public @interface StartInputReason { 
    int SESSION_CREATED_BY_ACCESSIBILITY = 11;

    /**

     * {@link android.view.inputmethod.InputMethodManager} is responding to

     * {@link com.android.internal.view.IInputMethodClient#onBindAccessibilityService(InputBindResult, int)}.

     * {@link com.android.internal.inputmethod.IInputMethodClient#onBindAccessibilityService(

     * InputBindResult, int)}.

     */

    int BOUND_ACCESSIBILITY_SESSION_TO_IMMS = 12;

}

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

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ import java.lang.annotation.Retention; 


/**

 * Describes the reason why {@link com.android.server.inputmethod.InputMethodManagerService} is

 * calling {@link com.android.internal.view.IInputMethodClient#onUnbindMethod}.

 * calling {@link com.android.internal.inputmethod.IInputMethodClient#onUnbindMethod}.

 */

@Retention(SOURCE)

@IntDef(value = {