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

Commit 9cc367d1 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix IME icon flicker when switching apps" into sc-dev am: 9e9caac6 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14779650

Change-Id: Ie2e50fbb4b32cda4250be4c5145b626d4cacbbc5
parents 0d6da8d9 9e9caac6

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

+4 −2
Original line number Diff line number Diff line
@@ -126,8 +126,10 @@ public abstract class InputMethodManagerInternal { 


    /**

     * Updates the IME visibility, back disposition and show IME picker status for SystemUI.

     * TODO(b/189923292): Making SystemUI to be true IME icon controller vs. presenter that

     *     controlled by IMMS.

     */

    public abstract void updateImeWindowStatus();

    public abstract void updateImeWindowStatus(boolean disableImeIcon);



    /**

     * Fake implementation of {@link InputMethodManagerInternal}.  All the methods do nothing.
@@ -182,7 +184,7 @@ public abstract class InputMethodManagerInternal { 
                }



                @Override

                public void updateImeWindowStatus() {

                public void updateImeWindowStatus(boolean disableImeIcon) {

                }

            };

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

+10 −7
Original line number Diff line number Diff line
@@ -2862,11 +2862,15 @@ public class InputMethodManagerService extends IInputMethodManager.Stub 
        }

    }



    private void updateImeWindowStatus() {

    private void updateImeWindowStatus(boolean disableImeIcon) {

        synchronized (mMethodMap) {

            if (disableImeIcon) {

                updateSystemUiLocked(0, mBackDisposition);

            } else {

                updateSystemUiLocked();

            }

        }

    }



    void updateSystemUiLocked() {

        updateSystemUiLocked(mImeWindowVis, mBackDisposition);
@@ -4413,9 +4417,7 @@ public class InputMethodManagerService extends IInputMethodManager.Stub 
                return true;

            }

            case MSG_UPDATE_IME_WINDOW_STATUS: {

                synchronized (mMethodMap) {

                    updateSystemUiLocked();

                }

                updateImeWindowStatus(msg.arg1 == 1);

                return true;

            }

            // ---------------------------------------------------------
@@ -5085,9 +5087,10 @@ public class InputMethodManagerService extends IInputMethodManager.Stub 
        }



        @Override

        public void updateImeWindowStatus() {

        public void updateImeWindowStatus(boolean disableImeIcon) {

            mService.mHandler.sendMessage(

                    mService.mHandler.obtainMessage(MSG_UPDATE_IME_WINDOW_STATUS));

                    mService.mHandler.obtainMessage(MSG_UPDATE_IME_WINDOW_STATUS,

                            disableImeIcon ? 1 : 0, 0));

        }

    }

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

+4 −4
Original line number Diff line number Diff line
@@ -261,12 +261,12 @@ public class InputMethodMenuController { 
            mSwitchingDialog.dismiss();

            mSwitchingDialog = null;

            mSwitchingDialogTitleView = null;

        }



            mService.updateSystemUiLocked();

            mDialogBuilder = null;

            mIms = null;

        }

    }



    HardKeyboardListener getHardKeyboardListener() {

        return mHardKeyboardListener;

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

+1 −1
Original line number Diff line number Diff line
@@ -243,7 +243,7 @@ public final class MultiClientInputMethodManagerService { 
                        }



                        @Override

                        public void updateImeWindowStatus() {

                        public void updateImeWindowStatus(boolean disableImeIcon) {

                        }

                    });

        }

services/core/java/com/android/server/wm/KeyguardController.java

+1 −1
Original line number Diff line number Diff line
@@ -192,7 +192,7 @@ class KeyguardController { 
        // state when evaluating visibilities.

        updateKeyguardSleepToken();

        mRootWindowContainer.ensureActivitiesVisible(null, 0, !PRESERVE_WINDOWS);

        InputMethodManagerInternal.get().updateImeWindowStatus();

        InputMethodManagerInternal.get().updateImeWindowStatus(false /* disableImeIcon */);

    }



    /**