Do not show security warning for the system IMEs

Bug: 6587127
Change-Id: I00584fb81cf5b39806c30a801b215a0e9a1e9399
This commit is contained in:
satok
2012-05-31 23:43:37 +09:00
parent caaa850ffb
commit 1506521362

View File

@@ -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);
}