Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 79f9fa07 authored by Hung-ying Tyan's avatar Hung-ying Tyan
Browse files

Reduce the number of keystore connections.

parent 7be218e7

src/com/android/settings/SecuritySettings.java

+8 −7
Original line number Diff line number Diff line
@@ -233,9 +233,10 @@ public class SecuritySettings extends PreferenceActivity implements 
        PreferenceCategory credStoreCat = new PreferenceCategory(this);

        credStoreCat.setTitle(R.string.cstor_settings_category);

        root.addPreference(credStoreCat);

        credStoreCat.addPreference(mCstorHelper.createAccessCheckBox());

        boolean i = mCstorHelper.isCstorInitialized();

        credStoreCat.addPreference(mCstorHelper.createAccessCheckBox(i));

        credStoreCat.addPreference(mCstorHelper.createSetPasswordPreference());

        credStoreCat.addPreference(mCstorHelper.createResetPreference());

        credStoreCat.addPreference(mCstorHelper.createResetPreference(i));



        return root;

    }
@@ -793,12 +794,12 @@ public class SecuritySettings extends PreferenceActivity implements 
            mResetButton.setEnabled(enabled);

        }



        private Preference createAccessCheckBox() {

        private Preference createAccessCheckBox(boolean isInitialized) {

            CheckBoxPreference pref = new CheckBoxPreference(

                    SecuritySettings.this);

            pref.setTitle(R.string.cstor_access_title);

            pref.setSummary(R.string.cstor_access_summary);

            pref.setChecked(isCstorUnlocked());

            if (isInitialized) pref.setChecked(isCstorUnlocked());

            pref.setOnPreferenceChangeListener(

                    new Preference.OnPreferenceChangeListener() {

                        public boolean onPreferenceChange(
@@ -813,7 +814,7 @@ public class SecuritySettings extends PreferenceActivity implements 
                            return true;

                        }

                    });

            pref.setEnabled(isCstorInitialized());

            pref.setEnabled(isInitialized);

            mAccessCheckBox = pref;

            return pref;

        }
@@ -834,7 +835,7 @@ public class SecuritySettings extends PreferenceActivity implements 
            return pref;

        }



        private Preference createResetPreference() {

        private Preference createResetPreference(boolean isInitialized) {

            Preference pref = new Preference(SecuritySettings.this);

            pref.setTitle(R.string.cstor_reset_title);

            pref.setSummary(R.string.cstor_reset_summary);
@@ -845,7 +846,7 @@ public class SecuritySettings extends PreferenceActivity implements 
                            return true;

                        }

                    });

            pref.setEnabled(isCstorInitialized());

            pref.setEnabled(isInitialized);

            mResetButton = pref;

            return pref;

        }