Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Yohei Yukawa
2016-04-06 15:06:56 +00:00
committed by Android (Google) Code Review
parent 2084796e23 2dbc532429
commit 12a52bc391
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/java/android/inputmethodservice/InputMethodService.java
View File

@@ -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;