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

Commit 1acaac07 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Micro-cleanup in password settings"

parents f94e2cca 5c9bbc17

src/com/android/settings/password/ChooseLockGeneric.java

+0 −11
Original line number Diff line number Diff line
@@ -101,8 +101,6 @@ public class ChooseLockGeneric extends SettingsActivity { 
        private static final String WAITING_FOR_CONFIRMATION = "waiting_for_confirmation";

        public static final String MINIMUM_QUALITY_KEY = "minimum_quality";

        public static final String HIDE_DISABLED_PREFS = "hide_disabled_prefs";

        public static final String ENCRYPT_REQUESTED_QUALITY = "encrypt_requested_quality";

        public static final String ENCRYPT_REQUESTED_DISABLED = "encrypt_requested_disabled";

        public static final String TAG_FRP_WARNING_DIALOG = "frp_warning_dialog";



        /**
@@ -138,8 +136,6 @@ public class ChooseLockGeneric extends SettingsActivity { 
        private long mChallenge;

        private boolean mPasswordConfirmed = false;

        private boolean mWaitingForConfirmation = false;

        private int mEncryptionRequestQuality;

        private boolean mEncryptionRequestDisabled;

        private boolean mForChangeCredRequiredForBoot = false;

        private String mUserPassword;

        private LockPatternUtils mLockPatternUtils;
@@ -193,9 +189,6 @@ public class ChooseLockGeneric extends SettingsActivity { 
            if (savedInstanceState != null) {

                mPasswordConfirmed = savedInstanceState.getBoolean(PASSWORD_CONFIRMED);

                mWaitingForConfirmation = savedInstanceState.getBoolean(WAITING_FOR_CONFIRMATION);

                mEncryptionRequestQuality = savedInstanceState.getInt(ENCRYPT_REQUESTED_QUALITY);

                mEncryptionRequestDisabled = savedInstanceState.getBoolean(

                        ENCRYPT_REQUESTED_DISABLED);

                if (mUserPassword == null) {

                    mUserPassword = savedInstanceState.getString(

                            ChooseLockSettingsHelper.EXTRA_KEY_PASSWORD);
@@ -298,8 +291,6 @@ public class ChooseLockGeneric extends SettingsActivity { 
                    && LockPatternUtils.isDeviceEncryptionEnabled()

                    && !LockPatternUtils.isFileEncryptionEnabled()

                    && !dpm.getDoNotAskCredentialsOnBoot()) {

                mEncryptionRequestQuality = quality;

                mEncryptionRequestDisabled = disabled;

                // Get the intent that the encryption interstitial should start for creating

                // the new unlock method.

                Intent unlockMethodIntent = getIntentForUnlockMethod(quality);
@@ -398,8 +389,6 @@ public class ChooseLockGeneric extends SettingsActivity { 
            // Saved so we don't force user to re-enter their password if configuration changes

            outState.putBoolean(PASSWORD_CONFIRMED, mPasswordConfirmed);

            outState.putBoolean(WAITING_FOR_CONFIRMATION, mWaitingForConfirmation);

            outState.putInt(ENCRYPT_REQUESTED_QUALITY, mEncryptionRequestQuality);

            outState.putBoolean(ENCRYPT_REQUESTED_DISABLED, mEncryptionRequestDisabled);

            if (mUserPassword != null) {

                outState.putString(ChooseLockSettingsHelper.EXTRA_KEY_PASSWORD, mUserPassword);

            }

src/com/android/settings/password/ScreenLockType.java

+0 −3
Original line number Diff line number Diff line
@@ -45,9 +45,6 @@ public enum ScreenLockType { 
            DevicePolicyManager.PASSWORD_QUALITY_MANAGED,

            "unlock_set_managed");



    private static final ScreenLockType MIN_QUALITY = ScreenLockType.NONE;

    private static final ScreenLockType MAX_QUALITY = ScreenLockType.MANAGED;



    /**

     * The default quality of the type of lock used. For example, in the case of PIN, the default

     * quality if PASSWORD_QUALITY_NUMERIC, while the highest quality is