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

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

Browse Source 
am: 8e0e5e8a88

* commit '8e0e5e8a8884d6536a3ee7511411e7d78d8ed265':
  Fix a behavior change in "Show software keyboard".

Change-Id: I86f131edcaa8ec069848830641a546b80e755f65
This commit is contained in:
Yohei Yukawa
2016-05-04 21:55:10 +00:00
committed by android-build-merger
parent f9cb0774fb 8e0e5e8a88
commit 1cdcbcbc8f
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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