summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorRoman Birg <romanbirg@gmail.com>2012-05-16 19:00:44 -0400
committerRick C <rickfitsnugly@gmail.com>2012-06-02 22:23:24 -0400
commit8b01451476e89551359c43558649043f74f23bf5 (patch)
tree8f6feba13e2a941627f80dc88571105f96eb28f3 /services
parentcb8448394dc18f5dc7df9750918b9e77f66c3955 (diff)
downloadframeworks_base-8b01451476e89551359c43558649043f74f23bf5.zip
frameworks_base-8b01451476e89551359c43558649043f74f23bf5.tar.gz
frameworks_base-8b01451476e89551359c43558649043f74f23bf5.tar.bz2
Option to hide IME switcher (2/2)
Change-Id: I210c1db65f8b5c41dcbcd559c0e7e0a53dd2df7f
Diffstat (limited to 'services')
-rw-r--r--services/java/com/android/server/InputMethodManagerService.java12
1 files changed, 10 insertions, 2 deletions
diff --git a/services/java/com/android/server/InputMethodManagerService.java b/services/java/com/android/server/InputMethodManagerService.java
index d0ae348..058cc7c 100644
--- a/services/java/com/android/server/InputMethodManagerService.java
+++ b/services/java/com/android/server/InputMethodManagerService.java
@@ -371,6 +371,13 @@ public class InputMethodManagerService extends IInputMethodManager.Stub
Settings.Secure.ENABLED_INPUT_METHODS), false, this);
resolver.registerContentObserver(Settings.Secure.getUriFor(
Settings.Secure.SELECTED_INPUT_METHOD_SUBTYPE), false, this);
+ resolver.registerContentObserver(Settings.Secure.getUriFor(
+ Settings.System.STATUS_BAR_IME_SWITCHER),
+ false, new ContentObserver(null) {
+ public void onChange(boolean selfChange) {
+ updateFromSettingsLocked();
+ }
+ });
}
@Override public void onChange(boolean selfChange) {
@@ -635,8 +642,6 @@ public class InputMethodManagerService extends IInputMethodManager.Stub
mStatusBar = statusBar;
statusBar.setIconVisibility("ime", false);
updateImeWindowStatusLocked();
- mShowOngoingImeSwitcherForPhones = mRes.getBoolean(
- com.android.internal.R.bool.show_ongoing_ime_switcher);
try {
startInputInnerLocked();
} catch (RuntimeException e) {
@@ -1297,6 +1302,9 @@ public class InputMethodManagerService extends IInputMethodManager.Stub
mCurMethodId = null;
unbindCurrentMethodLocked(true);
}
+
+ mShowOngoingImeSwitcherForPhones = Settings.System.getInt(mContext.getContentResolver(),
+ Settings.System.STATUS_BAR_IME_SWITCHER, 1) == 1;
}
/* package */ void setInputMethodLocked(String id, int subtypeId) {