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

Commit 1a546dca authored by Satoshi Kataoka's avatar Satoshi Kataoka Committed by Gerrit Code Review
Browse files

Merge "Fixed the problem ime invisible status despite being the icon that... 

Merge "Fixed the problem ime invisible status despite being the icon that appears in the statusbar."
parents 6a67a38f 217fd290

core/java/android/inputmethodservice/InputMethodService.java

+1 −1
Original line number Diff line number Diff line
@@ -424,7 +424,7 @@ public class InputMethodService extends AbstractInputMethodService { 
                showWindow(true);

            }

            // If user uses hard keyboard, IME button should always be shown.

            boolean showing = onEvaluateInputViewShown();

            boolean showing = isInputViewShown();

            mImm.setImeWindowStatus(mToken, IME_ACTIVE | (showing ? IME_VISIBLE : 0),

                    mBackDisposition);

            if (resultReceiver != null) {

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

+3 −1
Original line number Diff line number Diff line
@@ -1493,7 +1493,9 @@ public class InputMethodManagerService extends IInputMethodManager.Stub 
                if (mStatusBar != null) {

                    mStatusBar.setImeWindowStatus(token, vis, backDisposition);

                }

                final boolean iconVisibility = (vis & InputMethodService.IME_ACTIVE) != 0;

                final boolean iconVisibility = ((vis & (InputMethodService.IME_ACTIVE)) != 0)

                        && (mWindowManagerService.isHardKeyboardAvailable()

                                || (vis & (InputMethodService.IME_VISIBLE)) != 0);

                final InputMethodInfo imi = mMethodMap.get(mCurMethodId);

                if (imi != null && iconVisibility && needsToShowImeSwitchOngoingNotification()) {

                    // Used to load label