PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 04b85275: am 15065213: Do not show security warning for the system IMEs

Browse Source 
* commit '04b85275707b5171cd45ce4d7ba1a5cfac084ea8':
  Do not show security warning for the system IMEs
This commit is contained in:
satok
2012-05-31 08:05:53 -07:00
committed by Android Git Automerger
parent 1bfcc398f5 04b8527570
commit f79571a202
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/inputmethod/InputMethodPreference.java
View File

@@ -53,6 +53,7 @@ public class InputMethodPreference extends CheckBoxPreference
private final InputMethodManager mImm; private final InputMethodManager mImm;
private final Intent mSettingsIntent; private final Intent mSettingsIntent;
private final boolean mAlwaysChecked; private final boolean mAlwaysChecked;
private final boolean mIsSystemIme;
private AlertDialog mDialog = null; private AlertDialog mDialog = null;
private ImageView mInputMethodSettingsButton; private ImageView mInputMethodSettingsButton;
@@ -69,7 +70,7 @@ public class InputMethodPreference extends CheckBoxPreference
if (isChecked()) { if (isChecked()) {
setChecked(false, true /* save */); setChecked(false, true /* save */);
} else { } else {
if (mAlwaysChecked) { if (mIsSystemIme) {
setChecked(true, true /* save */); setChecked(true, true /* save */);
} else { } else {
showSecurityWarnDialog(mImi, InputMethodPreference.this); showSecurityWarnDialog(mImi, InputMethodPreference.this);
@@ -90,6 +91,7 @@ public class InputMethodPreference extends CheckBoxPreference
updateSummary(); updateSummary();
mAlwaysChecked = InputMethodAndSubtypeUtil.isAlwaysCheckedIme( mAlwaysChecked = InputMethodAndSubtypeUtil.isAlwaysCheckedIme(
imi, fragment.getActivity(), imiCount); imi, fragment.getActivity(), imiCount);
mIsSystemIme = InputMethodAndSubtypeUtil.isSystemIme(imi);
if (mAlwaysChecked) { if (mAlwaysChecked) {
setEnabled(false); setEnabled(false);
} }