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

Commit 12a52bc3 authored by Yohei Yukawa's avatar Yohei Yukawa Committed by Android (Google) Code Review
Browse files

Merge "Fix a regression in SHOW_IME_WITH_HARD_KEYBOARD handling." into nyc-dev

parents 2084796e 2dbc5324
Loading
Loading
Loading
Loading
+8 −1
Original line number Diff line number Diff line
@@ -717,7 +717,11 @@ public class InputMethodService extends AbstractInputMethodService {
                mShowImeWithHardKeyboard = Settings.Secure.getInt(mService.getContentResolver(),
                        Settings.Secure.SHOW_IME_WITH_HARD_KEYBOARD, 0) != 0 ?
                        ShowImeWithHardKeyboardType.TRUE : ShowImeWithHardKeyboardType.FALSE;
                mService.updateInputViewShown();
                // In Android M and prior, state change of
                // Settings.Secure.SHOW_IME_WITH_HARD_KEYBOARD has triggered
                // #onConfigurationChanged().  For compatibility reasons, we reset the internal
                // state as if configuration was changed.
                mService.resetStateForNewConfiguration();
            }
        }

@@ -884,7 +888,10 @@ public class InputMethodService extends AbstractInputMethodService {
     */
    @Override public void onConfigurationChanged(Configuration newConfig) {
        super.onConfigurationChanged(newConfig);
        resetStateForNewConfiguration();
    }

    private void resetStateForNewConfiguration() {
        boolean visible = mWindowVisible;
        int showFlags = mShowInputFlags;
        boolean showingInput = mShowInputRequested;