From af7537801de4bfc87091acccccc5c3e646f4dba7 Mon Sep 17 00:00:00 2001 From: Aaron Echols Date: Wed, 28 Nov 2012 09:26:14 -0500 Subject: Port "Add resource to disable the CM Phone IME selector method" Change-Id: I6fb482e227bf1de4799923cc952d4e3c8ad0d037 --- .../java/com/android/server/InputMethodManagerService.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'services/java/com/android/server/InputMethodManagerService.java') 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) { -- cgit v1.1