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

Commit 4e3f3a20 authored by Ken Wakasa's avatar Ken Wakasa Committed by Android Git Automerger
Browse files

am 8710e76a: Follow up change to I741642ac 

* commit '8710e76a':
  Follow up change to I741642ac
parents 13cd9664 8710e76a

core/java/android/inputmethodservice/InputMethodService.java

+1 −1
Original line number Diff line number Diff line
@@ -1065,7 +1065,7 @@ public class InputMethodService extends AbstractInputMethodService { 
    public boolean onEvaluateInputViewShown() {

        Configuration config = getResources().getConfiguration();

        return config.keyboard == Configuration.KEYBOARD_NOKEYS

                || config.hardKeyboardHidden == Configuration.KEYBOARDHIDDEN_YES;

                || config.hardKeyboardHidden == Configuration.HARDKEYBOARDHIDDEN_YES;

    }

    

    /**

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

+2 −1
Original line number Diff line number Diff line
@@ -1057,7 +1057,8 @@ public class InputMethodManagerService extends IInputMethodManager.Stub 
                            final boolean haveHardKeyboard = conf.keyboard

                                    != Configuration.KEYBOARD_NOKEYS;

                            final boolean hardKeyShown = haveHardKeyboard

                                    && conf.hardKeyboardHidden != Configuration.KEYBOARDHIDDEN_YES;

                                    && conf.hardKeyboardHidden

                                            != Configuration.HARDKEYBOARDHIDDEN_YES;

                            mImeWindowVis = (mInputShown || hardKeyShown) ? (

                                    InputMethodService.IME_ACTIVE | InputMethodService.IME_VISIBLE)

                                    : 0;