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

Commit 2518ff6a 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: 68c1e193 

am: 3af9c013

* commit '3af9c013':
  Fix a behavior change in "Show software keyboard".

Change-Id: I10f27d28ed6c187dedf7afe45997c3f758593ddf
parents f0b2bf30 3af9c013

core/java/android/inputmethodservice/InputMethodService.java

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

                // mode at this point.

                return false;

                return false;

            }

            }

            Configuration config = getResources().getConfiguration();

            if (!mSettingsObserver.shouldShowImeWithHardKeyboard() &&

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

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

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

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

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

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

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

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