Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move IInputMethodClient to com.android.internal.inputmethod

Browse Source 
Bug: 234882948
Test: presubmit
Change-Id: I7c11c9613732c3faa722938c2c4761868444cd42
This commit is contained in:
Yohei Yukawa
2022-06-03 17:27:34 -07:00
parent 4c04e35a3c
commit 3221237629
7 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/view/inputmethod/InputMethodManager.java
View File

@@ -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;

2
core/java/com/android/internal/view/IInputMethodClient.aidl → core/java/com/android/internal/inputmethod/IInputMethodClient.aidl
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.android.internal.view;
package com.android.internal.inputmethod;
import com.android.internal.inputmethod.InputBindResult;

3
core/java/com/android/internal/inputmethod/SoftInputShowHideReason.java
View File

@@ -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;

11
core/java/com/android/internal/inputmethod/StartInputReason.java
View File

@@ -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;
}

2
core/java/com/android/internal/inputmethod/UnbindReason.java
View File

@@ -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 = {

4
core/java/com/android/internal/view/IInputMethodManager.aidl
View File

@@ -22,10 +22,10 @@ import android.view.inputmethod.InputMethodSubtype;
import android.view.inputmethod.EditorInfo;
import android.window.ImeOnBackInvokedDispatcher;
import com.android.internal.inputmethod.InputBindResult;
import com.android.internal.inputmethod.IInputMethodClient;
import com.android.internal.inputmethod.IRemoteAccessibilityInputConnection;
import com.android.internal.inputmethod.InputBindResult;
import com.android.internal.view.IInputContext;
import com.android.internal.view.IInputMethodClient;
/**
* Public interface to the global input method manager, used by all client

2
services/core/java/com/android/server/inputmethod/InputMethodManagerService.java
View File

@@ -158,6 +158,7 @@ import com.android.internal.infra.AndroidFuture;
import com.android.internal.inputmethod.DirectBootAwareness;
import com.android.internal.inputmethod.IAccessibilityInputMethodSession;
import com.android.internal.inputmethod.IInputContentUriToken;
import com.android.internal.inputmethod.IInputMethodClient;
import com.android.internal.inputmethod.IInputMethodPrivilegedOperations;
import com.android.internal.inputmethod.IRemoteAccessibilityInputConnection;
import com.android.internal.inputmethod.ImeTracing;
@@ -177,7 +178,6 @@ import com.android.internal.util.DumpUtils;
import com.android.internal.view.IInlineSuggestionsRequestCallback;
import com.android.internal.view.IInlineSuggestionsResponseCallback;
import com.android.internal.view.IInputContext;
import com.android.internal.view.IInputMethodClient;
import com.android.internal.view.IInputMethodManager;
import com.android.internal.view.IInputMethodSession;
import com.android.internal.view.IInputSessionCallback;