diff options
| author | satok <satok@google.com> | 2012-05-31 23:43:37 +0900 |
|---|---|---|
| committer | satok <satok@google.com> | 2012-05-31 23:43:37 +0900 |
| commit | 15065213620da656c210f356c1111e7382f5be73 (patch) | |
| tree | 66693232e21091eb6a5de875a27b8a16a8213457 /src/com/android/settings/inputmethod | |
| parent | caaa850ffb143edd827cf2a9b9e49b37e9aa777d (diff) | |
| download | packages_apps_settings-15065213620da656c210f356c1111e7382f5be73.zip packages_apps_settings-15065213620da656c210f356c1111e7382f5be73.tar.gz packages_apps_settings-15065213620da656c210f356c1111e7382f5be73.tar.bz2 | |
Do not show security warning for the system IMEs
Bug: 6587127
Change-Id: I00584fb81cf5b39806c30a801b215a0e9a1e9399
Diffstat (limited to 'src/com/android/settings/inputmethod')
| -rw-r--r-- | src/com/android/settings/inputmethod/InputMethodPreference.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/settings/inputmethod/InputMethodPreference.java b/src/com/android/settings/inputmethod/InputMethodPreference.java index c736b2f..f555d21 100644 --- a/src/com/android/settings/inputmethod/InputMethodPreference.java +++ b/src/com/android/settings/inputmethod/InputMethodPreference.java @@ -53,6 +53,7 @@ public class InputMethodPreference extends CheckBoxPreference private final InputMethodManager mImm; private final Intent mSettingsIntent; private final boolean mAlwaysChecked; + private final boolean mIsSystemIme; private AlertDialog mDialog = null; private ImageView mInputMethodSettingsButton; @@ -69,7 +70,7 @@ public class InputMethodPreference extends CheckBoxPreference if (isChecked()) { setChecked(false, true /* save */); } else { - if (mAlwaysChecked) { + if (mIsSystemIme) { setChecked(true, true /* save */); } else { showSecurityWarnDialog(mImi, InputMethodPreference.this); @@ -90,6 +91,7 @@ public class InputMethodPreference extends CheckBoxPreference updateSummary(); mAlwaysChecked = InputMethodAndSubtypeUtil.isAlwaysCheckedIme( imi, fragment.getActivity(), imiCount); + mIsSystemIme = InputMethodAndSubtypeUtil.isSystemIme(imi); if (mAlwaysChecked) { setEnabled(false); } |