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

Commit 2903b9da authored by Cosmin Băieș's avatar Cosmin Băieș
Browse files

Move IImeTracker from view to inputmethod 

Test: build and run; filter logcat for ImeTracker tag and ensure logs
  are getting created
Bug: 270549048

Change-Id: I59db19c58b3f35004fdb739e69aa9453c7d1777f
parent de00d4b2

core/java/android/view/inputmethod/IInputMethodManagerGlobalInvoker.java

+1 −1
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ import android.view.WindowManager; 
import android.window.ImeOnBackInvokedDispatcher;



import com.android.internal.inputmethod.DirectBootAwareness;

import com.android.internal.inputmethod.IImeTracker;

import com.android.internal.inputmethod.IInputMethodClient;

import com.android.internal.inputmethod.IRemoteAccessibilityInputConnection;

import com.android.internal.inputmethod.IRemoteInputConnection;
@@ -41,7 +42,6 @@ import com.android.internal.inputmethod.InputBindResult; 
import com.android.internal.inputmethod.SoftInputShowHideReason;

import com.android.internal.inputmethod.StartInputFlags;

import com.android.internal.inputmethod.StartInputReason;

import com.android.internal.view.IImeTracker;

import com.android.internal.view.IInputMethodManager;



import java.util.ArrayList;

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

core/java/com/android/internal/view/IInputMethodManager.aidl

+1 −1
Original line number Diff line number Diff line
@@ -23,11 +23,11 @@ import android.view.inputmethod.InputMethodSubtype; 
import android.view.inputmethod.EditorInfo;

import android.window.ImeOnBackInvokedDispatcher;



import com.android.internal.inputmethod.IImeTracker;

import com.android.internal.inputmethod.IInputMethodClient;

import com.android.internal.inputmethod.IRemoteAccessibilityInputConnection;

import com.android.internal.inputmethod.IRemoteInputConnection;

import com.android.internal.inputmethod.InputBindResult;

import com.android.internal.view.IImeTracker;



/**

 * Public interface to the global input method manager, used by all client

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

+1 −1
Original line number Diff line number Diff line
@@ -28,10 +28,10 @@ import android.util.Log; 
import android.view.inputmethod.ImeTracker;



import com.android.internal.annotations.GuardedBy;

import com.android.internal.inputmethod.IImeTracker;

import com.android.internal.inputmethod.InputMethodDebug;

import com.android.internal.inputmethod.SoftInputShowHideReason;

import com.android.internal.util.FrameworkStatsLog;

import com.android.internal.view.IImeTracker;



import java.io.PrintWriter;

import java.time.Instant;

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

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

import com.android.internal.inputmethod.IInlineSuggestionsRequestCallback;

import com.android.internal.inputmethod.IInputContentUriToken;

import com.android.internal.inputmethod.IInputMethod;
@@ -168,7 +169,6 @@ import com.android.internal.os.TransferPipe; 
import com.android.internal.util.ArrayUtils;

import com.android.internal.util.ConcurrentUtils;

import com.android.internal.util.DumpUtils;

import com.android.internal.view.IImeTracker;

import com.android.internal.view.IInputMethodManager;

import com.android.server.AccessibilityManagerInternal;

import com.android.server.EventLogTags;