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

am 38322393: Merge change 9437 into donut

Browse Source 
Merge commit '38322393a6d029349ef4ef4f80757da175029bcb'

* commit '38322393a6d029349ef4ef4f80757da175029bcb':
  Reduce the number of keystore connections.
This commit is contained in:
Android (Google) Code Review
2009-07-31 20:18:10 -07:00
committed by Android Git Automerger
parent b6f1080058 38322393a6
commit 12fb9066a3
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/com/android/settings/SecuritySettings.java
View File

@@ -236,9 +236,10 @@ public class SecuritySettings extends PreferenceActivity implements
PreferenceCategory credStoreCat = new PreferenceCategory(this); PreferenceCategory credStoreCat = new PreferenceCategory(this);
credStoreCat.setTitle(R.string.cstor_settings_category); credStoreCat.setTitle(R.string.cstor_settings_category);
root.addPreference(credStoreCat); root.addPreference(credStoreCat);
credStoreCat.addPreference(mCstorHelper.createAccessCheckBox()); boolean i = mCstorHelper.isCstorInitialized();
credStoreCat.addPreference(mCstorHelper.createAccessCheckBox(i));
credStoreCat.addPreference(mCstorHelper.createSetPasswordPreference()); credStoreCat.addPreference(mCstorHelper.createSetPasswordPreference());
credStoreCat.addPreference(mCstorHelper.createResetPreference()); credStoreCat.addPreference(mCstorHelper.createResetPreference(i));
return root; return root;
} }
@@ -805,12 +806,12 @@ public class SecuritySettings extends PreferenceActivity implements
mResetButton.setEnabled(enabled); mResetButton.setEnabled(enabled);
} }
private Preference createAccessCheckBox() { private Preference createAccessCheckBox(boolean isInitialized) {
CheckBoxPreference pref = new CheckBoxPreference( CheckBoxPreference pref = new CheckBoxPreference(
SecuritySettings.this); SecuritySettings.this);
pref.setTitle(R.string.cstor_access_title); pref.setTitle(R.string.cstor_access_title);
pref.setSummary(R.string.cstor_access_summary); pref.setSummary(R.string.cstor_access_summary);
pref.setChecked(isCstorUnlocked()); if (isInitialized) pref.setChecked(isCstorUnlocked());
pref.setOnPreferenceChangeListener( pref.setOnPreferenceChangeListener(
new Preference.OnPreferenceChangeListener() { new Preference.OnPreferenceChangeListener() {
public boolean onPreferenceChange( public boolean onPreferenceChange(
@@ -825,7 +826,7 @@ public class SecuritySettings extends PreferenceActivity implements
return true; return true;
} }
}); });
pref.setEnabled(isCstorInitialized()); pref.setEnabled(isInitialized);
mAccessCheckBox = pref; mAccessCheckBox = pref;
return pref; return pref;
} }
@@ -846,7 +847,7 @@ public class SecuritySettings extends PreferenceActivity implements
return pref; return pref;
} }
private Preference createResetPreference() { private Preference createResetPreference(boolean isInitialized) {
Preference pref = new Preference(SecuritySettings.this); Preference pref = new Preference(SecuritySettings.this);
pref.setTitle(R.string.cstor_reset_title); pref.setTitle(R.string.cstor_reset_title);
pref.setSummary(R.string.cstor_reset_summary); pref.setSummary(R.string.cstor_reset_summary);
@@ -857,7 +858,7 @@ public class SecuritySettings extends PreferenceActivity implements
return true; return true;
} }
}); });
pref.setEnabled(isCstorInitialized()); pref.setEnabled(isInitialized);
mResetButton = pref; mResetButton = pref;
return pref; return pref;
} }