summaryrefslogtreecommitdiffstats
path: root/services/core/java
diff options
context:
space:
mode:
authorYohei Yukawa <yukawa@google.com>2014-10-13 18:57:58 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-10-13 18:57:58 +0000
commit9ca39d744cdf6ffdb782bbc883b2f4266545f64e (patch)
tree0a2e1fbb30e126b0f861246a422991afbcd4c310 /services/core/java
parent0a4e2245263c594d85f7579c970c926c50bc1ede (diff)
parent540861c925df9b3743251e5d219cd5fe790f9048 (diff)
downloadframeworks_base-9ca39d744cdf6ffdb782bbc883b2f4266545f64e.zip
frameworks_base-9ca39d744cdf6ffdb782bbc883b2f4266545f64e.tar.gz
frameworks_base-9ca39d744cdf6ffdb782bbc883b2f4266545f64e.tar.bz2
am 540861c9: am 2dfd8d57: Merge "Update config when "Show input method" is changed" into lmp-dev
* commit '540861c925df9b3743251e5d219cd5fe790f9048': Update config when "Show input method" is changed
Diffstat (limited to 'services/core/java')
-rw-r--r--services/core/java/com/android/server/wm/WindowManagerService.java7
1 files changed, 5 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java
index 8437d52..837672a 100644
--- a/services/core/java/com/android/server/wm/WindowManagerService.java
+++ b/services/core/java/com/android/server/wm/WindowManagerService.java
@@ -7226,11 +7226,14 @@ public class WindowManagerService extends IWindowManager.Stub
}
public void updateShowImeWithHardKeyboard() {
- boolean showImeWithHardKeyboard = Settings.Secure.getIntForUser(
+ final boolean showImeWithHardKeyboard = Settings.Secure.getIntForUser(
mContext.getContentResolver(), Settings.Secure.SHOW_IME_WITH_HARD_KEYBOARD, 0,
mCurrentUserId) == 1;
synchronized (mWindowMap) {
- mShowImeWithHardKeyboard = showImeWithHardKeyboard;
+ if (mShowImeWithHardKeyboard != showImeWithHardKeyboard) {
+ mShowImeWithHardKeyboard = showImeWithHardKeyboard;
+ mH.sendEmptyMessage(H.SEND_NEW_CONFIGURATION);
+ }
}
}