diff options
| author | Aaron Echols <atechols@gmail.com> | 2012-11-28 09:26:14 -0500 |
|---|---|---|
| committer | Rick C <rickfitsnugly@gmail.com> | 2012-11-28 09:29:59 -0500 |
| commit | af7537801de4bfc87091acccccc5c3e646f4dba7 (patch) | |
| tree | 5911302791c6333b3407c379ad0572d2fae2bfcc | |
| parent | 17cbe6c3a89bacd5e4349bfa3f69b36e43737826 (diff) | |
| download | frameworks_base-af7537801de4bfc87091acccccc5c3e646f4dba7.zip frameworks_base-af7537801de4bfc87091acccccc5c3e646f4dba7.tar.gz frameworks_base-af7537801de4bfc87091acccccc5c3e646f4dba7.tar.bz2 | |
Port "Add resource to disable the CM Phone IME selector method"
Change-Id: I6fb482e227bf1de4799923cc952d4e3c8ad0d037
| -rwxr-xr-x | core/res/res/values/config.xml | 3 | ||||
| -rw-r--r-- | core/res/res/values/symbols.xml | 1 | ||||
| -rw-r--r-- | services/java/com/android/server/InputMethodManagerService.java | 10 |
3 files changed, 12 insertions, 2 deletions
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index 30391a1..1b3a6da 100755 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -1045,4 +1045,7 @@ <!-- Workaround for devices with broken keyboards --> <bool name="config_forceDisableHardwareKeyboard">false</bool> + <!-- Setting to false will disable CM's IME switcher implementation for tablets --> + <bool name="config_show_cmIMESwitcher">true</bool> + </resources> diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index b3c2b9a..32b81f5 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -1825,6 +1825,7 @@ <java-symbol type="bool" name="config_forceDisableHardwareKeyboard" /> <java-symbol type="bool" name="config_hasRotationLockSwitch" /> <java-symbol type="integer" name="config_backKillTimeout" /> + <java-symbol type="bool" name="config_show_cmIMESwitcher"/> <!-- Notification and battery light --> <java-symbol type="bool" name="config_intrusiveBatteryLed" /> diff --git a/services/java/com/android/server/InputMethodManagerService.java b/services/java/com/android/server/InputMethodManagerService.java index 445a4bb..b4c6a3e 100644 --- a/services/java/com/android/server/InputMethodManagerService.java +++ b/services/java/com/android/server/InputMethodManagerService.java @@ -1611,8 +1611,14 @@ public class InputMethodManagerService extends IInputMethodManager.Stub mCurMethodId = null; unbindCurrentMethodLocked(true, false); } - mShowOngoingImeSwitcherForPhones = Settings.System.getInt(mContext.getContentResolver(), - Settings.System.STATUS_BAR_IME_SWITCHER, 1) == 1; + // code to disable the CM Phone IME switcher with config_show_cmIMESwitcher set = false + try { + mShowOngoingImeSwitcherForPhones = Settings.System.getInt(mContext.getContentResolver(), + Settings.System.STATUS_BAR_IME_SWITCHER) == 1; + } catch (SettingNotFoundException e) { + mShowOngoingImeSwitcherForPhones = mRes.getBoolean( + com.android.internal.R.bool.config_show_cmIMESwitcher); + } } /* package */ void setInputMethodLocked(String id, int subtypeId) { |