Merge "Fix a behavior change in "Show software keyboard"." into nyc-dev
This commit is contained in:
@@ -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.
|
||||||
|
|||||||
Reference in New Issue
Block a user