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

Commit f08b176d authored by Yohei Yukawa's avatar Yohei Yukawa Committed by android-build-merger
Browse files

Merge "Fix a behavior change in "Show software keyboard"." into nyc-dev am:... 

Merge "Fix a behavior change in "Show software keyboard"." into nyc-dev am: 68c1e193 am: 8e0e5e8a
am: 1cdcbcbc

* commit '1cdcbcbc':
  Fix a behavior change in "Show software keyboard".

Change-Id: I6a0a06bbbe6d23c9398967d7cb4eb89f90eaae9d
parents da0755ee 1cdcbcbc

core/java/android/inputmethodservice/InputMethodService.java

+2 −2
Original line number Diff line number Diff line
@@ -1536,8 +1536,8 @@ public class InputMethodService extends AbstractInputMethodService { 
                // mode at this point.

                return false;

            }

            Configuration config = getResources().getConfiguration();

            if (config.keyboard != Configuration.KEYBOARD_NOKEYS) {

            if (!mSettingsObserver.shouldShowImeWithHardKeyboard() &&

                    getResources().getConfiguration().keyboard != Configuration.KEYBOARD_NOKEYS) {

                // And if the device has a hard keyboard, even if it is

                // currently hidden, don't show the input method implicitly.

                // These kinds of devices don't need it that much.