From 499e66b2d17c8a04b842d21d2e32359230d16882 Mon Sep 17 00:00:00 2001 From: Wilson Wu Date: Thu, 11 Nov 2021 16:32:30 +0800 Subject: [PATCH] Remove isMultiClientImeEnabled from SystemUI The Multi-Client IME was removed by CL[1]. We no longer need the the isMultiClientImeEnabled related logic in SystemUI. Remove it for code health. [1]: I0bdc8fe3d32ccabc8ea7996fc689543c3f99331a Bug: 173341412 Fix: 205863279 Test: Build and flash Change-Id: I042d40623ed34251a212fbf25f72de5647b88835 --- core/java/android/view/inputmethod/EditorInfo.java | 4 ---- .../com/android/internal/statusbar/IStatusBar.aidl | 2 +- .../android/internal/statusbar/IStatusBarService.aidl | 2 +- .../com/android/systemui/statusbar/CommandQueue.java | 10 ++++------ .../android/systemui/statusbar/CommandQueueTest.java | 4 ++-- .../server/inputmethod/InputMethodManagerService.java | 2 +- .../server/statusbar/StatusBarManagerService.java | 6 ++---- 7 files changed, 11 insertions(+), 19 deletions(-) diff --git a/core/java/android/view/inputmethod/EditorInfo.java b/core/java/android/view/inputmethod/EditorInfo.java index 4a52b1f01b46e..35e60b8b023df 100644 --- a/core/java/android/view/inputmethod/EditorInfo.java +++ b/core/java/android/view/inputmethod/EditorInfo.java @@ -528,10 +528,6 @@ public class EditorInfo implements InputType, Parcelable { * If not {@code null}, this editor needs to talk to IMEs that run for the specified user, no * matter what user ID the calling process has. * - *

Note: This field will be silently ignored when - * {@link com.android.server.inputmethod.InputMethodSystemProperty#MULTI_CLIENT_IME_ENABLED} is - * {@code true}.

- * *

Note also that pseudo handles such as {@link UserHandle#ALL} are not supported.

* * @hide diff --git a/core/java/com/android/internal/statusbar/IStatusBar.aidl b/core/java/com/android/internal/statusbar/IStatusBar.aidl index 4e758e6a1645a..f3cdf827984f6 100644 --- a/core/java/com/android/internal/statusbar/IStatusBar.aidl +++ b/core/java/com/android/internal/statusbar/IStatusBar.aidl @@ -46,7 +46,7 @@ oneway interface IStatusBar void showWirelessChargingAnimation(int batteryLevel); void setImeWindowStatus(int displayId, in IBinder token, int vis, int backDisposition, - boolean showImeSwitcher, boolean isMultiClientImeEnabled); + boolean showImeSwitcher); void setWindowState(int display, int window, int state); void showRecentApps(boolean triggeredFromAltTab); diff --git a/core/java/com/android/internal/statusbar/IStatusBarService.aidl b/core/java/com/android/internal/statusbar/IStatusBarService.aidl index 40a39510b50de..1db7426ba6cff 100644 --- a/core/java/com/android/internal/statusbar/IStatusBarService.aidl +++ b/core/java/com/android/internal/statusbar/IStatusBarService.aidl @@ -55,7 +55,7 @@ interface IStatusBarService @UnsupportedAppUsage void removeIcon(String slot); void setImeWindowStatus(int displayId, in IBinder token, int vis, int backDisposition, - boolean showImeSwitcher, boolean isMultiClientImeEnabled); + boolean showImeSwitcher); void expandSettingsPanel(String subPanel); // ---- Methods below are for use by the status bar policy services ---- diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/CommandQueue.java b/packages/SystemUI/src/com/android/systemui/statusbar/CommandQueue.java index c25bc84faedc7..07e35a6619a2f 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/CommandQueue.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/CommandQueue.java @@ -596,7 +596,7 @@ public class CommandQueue extends IStatusBar.Stub implements @Override public void setImeWindowStatus(int displayId, IBinder token, int vis, int backDisposition, - boolean showImeSwitcher, boolean isMultiClientImeEnabled) { + boolean showImeSwitcher) { synchronized (mLock) { mHandler.removeMessages(MSG_SHOW_IME_BUTTON); SomeArgs args = SomeArgs.obtain(); @@ -604,7 +604,6 @@ public class CommandQueue extends IStatusBar.Stub implements args.argi2 = vis; args.argi3 = backDisposition; args.argi4 = showImeSwitcher ? 1 : 0; - args.argi5 = isMultiClientImeEnabled ? 1 : 0; args.arg1 = token; Message m = mHandler.obtainMessage(MSG_SHOW_IME_BUTTON, args); m.sendToTarget(); @@ -993,10 +992,10 @@ public class CommandQueue extends IStatusBar.Stub implements } private void handleShowImeButton(int displayId, IBinder token, int vis, int backDisposition, - boolean showImeSwitcher, boolean isMultiClientImeEnabled) { + boolean showImeSwitcher) { if (displayId == INVALID_DISPLAY) return; - if (!isMultiClientImeEnabled && mLastUpdatedImeDisplayId != displayId + if (mLastUpdatedImeDisplayId != displayId && mLastUpdatedImeDisplayId != INVALID_DISPLAY) { // Set previous NavBar's IME window status as invisible when IME // window switched to another display for single-session IME case. @@ -1206,8 +1205,7 @@ public class CommandQueue extends IStatusBar.Stub implements args = (SomeArgs) msg.obj; handleShowImeButton(args.argi1 /* displayId */, (IBinder) args.arg1 /* token */, args.argi2 /* vis */, args.argi3 /* backDisposition */, - args.argi4 != 0 /* showImeSwitcher */, - args.argi5 != 0 /* isMultiClientImeEnabled */); + args.argi4 != 0 /* showImeSwitcher */); break; case MSG_SHOW_RECENT_APPS: for (int i = 0; i < mCallbacks.size(); i++) { diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/CommandQueueTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/CommandQueueTest.java index af624ed1ea1a0..5de4c115ee561 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/CommandQueueTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/CommandQueueTest.java @@ -182,7 +182,7 @@ public class CommandQueueTest extends SysuiTestCase { @Test public void testShowImeButton() { - mCommandQueue.setImeWindowStatus(DEFAULT_DISPLAY, null, 1, 2, true, false); + mCommandQueue.setImeWindowStatus(DEFAULT_DISPLAY, null, 1, 2, true); waitForIdleSync(); verify(mCallbacks).setImeWindowStatus( eq(DEFAULT_DISPLAY), eq(null), eq(1), eq(2), eq(true)); @@ -193,7 +193,7 @@ public class CommandQueueTest extends SysuiTestCase { // First show in default display to update the "last updated ime display" testShowImeButton(); - mCommandQueue.setImeWindowStatus(SECONDARY_DISPLAY, null, 1, 2, true, false); + mCommandQueue.setImeWindowStatus(SECONDARY_DISPLAY, null, 1, 2, true); waitForIdleSync(); verify(mCallbacks).setImeWindowStatus(eq(DEFAULT_DISPLAY), eq(null), eq(IME_INVISIBLE), eq(BACK_DISPOSITION_DEFAULT), eq(false)); diff --git a/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java b/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java index d14ef162de3c9..434d43457150e 100644 --- a/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java +++ b/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java @@ -2916,7 +2916,7 @@ public class InputMethodManagerService extends IInputMethodManager.Stub final boolean needsToShowImeSwitcher = shouldShowImeSwitcherLocked(vis); if (mStatusBar != null) { mStatusBar.setImeWindowStatus(mCurTokenDisplayId, mCurToken, vis, backDisposition, - needsToShowImeSwitcher, false /*isMultiClientImeEnabled*/); + needsToShowImeSwitcher); } final InputMethodInfo imi = mMethodMap.get(mCurMethodId); if (imi != null && needsToShowImeSwitcher) { diff --git a/services/core/java/com/android/server/statusbar/StatusBarManagerService.java b/services/core/java/com/android/server/statusbar/StatusBarManagerService.java index a0f03670793b9..232ea0977abad 100644 --- a/services/core/java/com/android/server/statusbar/StatusBarManagerService.java +++ b/services/core/java/com/android/server/statusbar/StatusBarManagerService.java @@ -1065,8 +1065,7 @@ public class StatusBarManagerService extends IStatusBarService.Stub implements D @Override public void setImeWindowStatus(int displayId, final IBinder token, final int vis, - final int backDisposition, final boolean showImeSwitcher, - boolean isMultiClientImeEnabled) { + final int backDisposition, final boolean showImeSwitcher) { enforceStatusBar(); if (SPEW) { @@ -1083,8 +1082,7 @@ public class StatusBarManagerService extends IStatusBarService.Stub implements D if (mBar == null) return; try { mBar.setImeWindowStatus( - displayId, token, vis, backDisposition, showImeSwitcher, - isMultiClientImeEnabled); + displayId, token, vis, backDisposition, showImeSwitcher); } catch (RemoteException ex) { } }); }