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

Merge "Reduce the amount of I/O done on the UI thread." into jb-dev

Browse Source
This commit is contained in:
Amith Yamasani
2012-05-07 18:11:28 -07:00
committed by Android (Google) Code Review
parent 63f7f5cda5 f6d8961843
commit 184ae2c3f2
1 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -66,10 +66,10 @@ public class InputMethodPreference extends CheckBoxPreference
return;
}
if (isChecked()) {
setChecked(false);
setChecked(false, true /* save */);
} else {
if (mAlwaysChecked) {
setChecked(true);
setChecked(true, true /* save */);
} else {
showSecurityWarnDialog(mImi, InputMethodPreference.this);
}
@@ -222,14 +222,25 @@ public class InputMethodPreference extends CheckBoxPreference
setSummary(summary);
}
@Override
public void setChecked(boolean checked) {
/**
* Sets the checkbox state and optionally saves the settings.
* @param checked whether to check the box
* @param save whether to save IME settings
*/
public void setChecked(boolean checked, boolean save) {
super.setChecked(checked);
saveImeSettings();
if (save) {
saveImeSettings();
}
updateSummary();
}
private void showSecurityWarnDialog(InputMethodInfo imi, final CheckBoxPreference chkPref) {
@Override
public void setChecked(boolean checked) {
setChecked(checked, false);
}
private void showSecurityWarnDialog(InputMethodInfo imi, final InputMethodPreference chkPref) {
if (mDialog != null && mDialog.isShowing()) {
mDialog.dismiss();
}
@@ -241,7 +252,7 @@ public class InputMethodPreference extends CheckBoxPreference
new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
chkPref.setChecked(true);
chkPref.setChecked(true, true);
}
})
.setNegativeButton(android.R.string.cancel,