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

Commit 499e66b2 authored by Wilson Wu's avatar Wilson Wu
Browse files

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
parent b9254c2b

core/java/android/view/inputmethod/EditorInfo.java

+0 −4
Original line number Diff line number Diff line
@@ -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.

     *

     * <p>Note: This field will be silently ignored when

     * {@link com.android.server.inputmethod.InputMethodSystemProperty#MULTI_CLIENT_IME_ENABLED} is

     * {@code true}.</p>

     *

     * <p>Note also that pseudo handles such as {@link UserHandle#ALL} are not supported.</p>

     *

     * @hide

core/java/com/android/internal/statusbar/IStatusBar.aidl

+1 −1
Original line number Diff line number Diff line
@@ -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);

core/java/com/android/internal/statusbar/IStatusBarService.aidl

+1 −1
Original line number Diff line number Diff line
@@ -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 ----

packages/SystemUI/src/com/android/systemui/statusbar/CommandQueue.java

+4 −6
Original line number Diff line number Diff line
@@ -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++) {

packages/SystemUI/tests/src/com/android/systemui/statusbar/CommandQueueTest.java

+2 −2
Original line number Diff line number Diff line
@@ -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));