Rename IMM#mIInputContext to IMM#mFallbackInputConnection

This is a mechanical refactoring CL that renames

  InputMethodManager#mIInputContext

to

  InputMethodManager#mFallbackInputConnection,

which is supposed to describe what it is more accurately.

This is a preparation for upcoming remanings e.g.:

 * IInputContext -> IInputConnection
 * IInputContextInvoker -> IInputConnectionInvoker
 * IInputConnectionWrapper -> RemotableInputConnection

Bug: 192412909
Test: presubmit
Change-Id: Ibb982eb5322eb0928a4bbe9a08bd81e89724170d
This commit is contained in:
Yohei Yukawa
2021-07-22 14:56:23 -07:00
parent ec0a7594f3
commit 68d63ef153

View File

@@ -365,7 +365,7 @@ public final class InputMethodManager {
final H mH;
// Our generic input connection if the current target does not have its own.
private final IInputConnectionWrapper mIInputContext;
private final IInputConnectionWrapper mFallbackInputConnection;
private final int mDisplayId;
@@ -920,7 +920,7 @@ public final class InputMethodManager {
mRestartOnNextWindowFocus = true;
// Note that finishComposingText() is allowed to run
// even when we are not active.
mIInputContext.finishComposingText();
mFallbackInputConnection.finishComposingText();
}
// Check focus again in case that "onWindowFocus" is called before
// handling this message.
@@ -1028,8 +1028,6 @@ public final class InputMethodManager {
}
};
final InputConnection mDummyInputConnection = new BaseInputConnection(this, false);
/**
* For layoutlib to clean up static objects inside {@link InputMethodManager}.
*/
@@ -1078,7 +1076,7 @@ public final class InputMethodManager {
// 1) doing so has no effect for A and 2) doing so is sufficient for B.
final long identity = Binder.clearCallingIdentity();
try {
service.addClient(imm.mClient, imm.mIInputContext, displayId);
service.addClient(imm.mClient, imm.mFallbackInputConnection, displayId);
} catch (RemoteException e) {
e.rethrowFromSystemServer();
} finally {
@@ -1123,7 +1121,8 @@ public final class InputMethodManager {
mMainLooper = looper;
mH = new H(looper);
mDisplayId = displayId;
mIInputContext = new IInputConnectionWrapper(looper, mDummyInputConnection, this, null);
mFallbackInputConnection = new IInputConnectionWrapper(looper,
new BaseInputConnection(this, false), this, null);
}
/**
@@ -3081,7 +3080,7 @@ public final class InputMethodManager {
p.println(" mService=" + mService);
p.println(" mMainLooper=" + mMainLooper);
p.println(" mIInputContext=" + mIInputContext);
p.println(" mFallbackInputConnection=" + mFallbackInputConnection);
p.println(" mActive=" + mActive
+ " mRestartOnNextWindowFocus=" + mRestartOnNextWindowFocus
+ " mBindSequence=" + mBindSequence