commit 15065213620da656c210f356c1111e7382f5be73
author satok <satok@google.com> Thu May 31 23:43:37 2012 +0900
committer satok <satok@google.com> Thu May 31 23:43:37 2012 +0900
tree 66693232e21091eb6a5de875a27b8a16a8213457
parent caaa850ffb143edd827cf2a9b9e49b37e9aa777d

Do not show security warning for the system IMEs

Bug: 6587127
Change-Id: I00584fb81cf5b39806c30a801b215a0e9a1e9399

src/com/android/settings/inputmethod/InputMethodPreference.java

diff --git a/src/com/android/settings/inputmethod/InputMethodPreference.java b/src/com/android/settings/inputmethod/InputMethodPreference.java
index c736b2f5..f555d21 100644
--- a/src/com/android/settings/inputmethod/InputMethodPreference.java
+++ b/src/com/android/settings/inputmethod/InputMethodPreference.java
@@ -53,6 +53,7 @@
     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 @@
             if (isChecked()) {
                 setChecked(false, true /* save */);
             } else {
-                if (mAlwaysChecked) {
+                if (mIsSystemIme) {
                     setChecked(true, true /* save */);
                 } else {
                     showSecurityWarnDialog(mImi, InputMethodPreference.this);
@@ -90,6 +91,7 @@
         updateSummary();
         mAlwaysChecked = InputMethodAndSubtypeUtil.isAlwaysCheckedIme(
                 imi, fragment.getActivity(), imiCount);
+        mIsSystemIme = InputMethodAndSubtypeUtil.isSystemIme(imi);
         if (mAlwaysChecked) {
             setEnabled(false);
         }