am 2dfd8d57: Merge "Update config when "Show input method" is changed" into lmp-dev

* commit '2dfd8d578a0c5b90ee10ce1f3ddb4aeb0e948f60':
  Update config when "Show input method" is changed
This commit is contained in:
Yohei Yukawa
2014-10-13 18:48:16 +00:00
committed by Android Git Automerger

View File

@@ -7226,11 +7226,14 @@ public class WindowManagerService extends IWindowManager.Stub
} }
public void updateShowImeWithHardKeyboard() { public void updateShowImeWithHardKeyboard() {
boolean showImeWithHardKeyboard = Settings.Secure.getIntForUser( final boolean showImeWithHardKeyboard = Settings.Secure.getIntForUser(
mContext.getContentResolver(), Settings.Secure.SHOW_IME_WITH_HARD_KEYBOARD, 0, mContext.getContentResolver(), Settings.Secure.SHOW_IME_WITH_HARD_KEYBOARD, 0,
mCurrentUserId) == 1; mCurrentUserId) == 1;
synchronized (mWindowMap) { synchronized (mWindowMap) {
mShowImeWithHardKeyboard = showImeWithHardKeyboard; if (mShowImeWithHardKeyboard != showImeWithHardKeyboard) {
mShowImeWithHardKeyboard = showImeWithHardKeyboard;
mH.sendEmptyMessage(H.SEND_NEW_CONFIGURATION);
}
} }
} }