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

Commit 4c9a5fe6 authored by Danielle Millett's avatar Danielle Millett Committed by Android (Google) Code Review
Browse files

Merge "Fix 5466557: Removed secondary screenlock settings labels" into ics-mr0

parents 6ab0c12c 80412e70

res/xml/security_settings_picker.xml

+0 −6
Original line number Diff line number Diff line
@@ -19,37 +19,31 @@ 
    <PreferenceScreen

            android:key="unlock_set_off"

            android:title="@string/unlock_set_unlock_off_title"

            android:summary="@string/unlock_set_unlock_off_summary"

            android:persistent="false"/>



    <PreferenceScreen

            android:key="unlock_set_none"

            android:title="@string/unlock_set_unlock_none_title"

            android:summary="@string/unlock_set_unlock_none_summary"

            android:persistent="false"/>



    <PreferenceScreen

            android:key="unlock_set_biometric_weak"

            android:title="@string/unlock_set_unlock_biometric_weak_title"

            android:summary="@string/unlock_set_unlock_biometric_weak_summary"

            android:persistent="false"/>



    <PreferenceScreen

            android:key="unlock_set_pattern"

            android:title="@string/unlock_set_unlock_pattern_title"

            android:summary="@string/unlock_set_unlock_pattern_summary"

            android:persistent="false"/>



    <PreferenceScreen

            android:key="unlock_set_pin"

            android:title="@string/unlock_set_unlock_pin_title"

            android:summary="@string/unlock_set_unlock_pin_summary"

            android:persistent="false"/>



    <PreferenceScreen

            android:key="unlock_set_password"

            android:title="@string/unlock_set_unlock_password_title"

            android:summary="@string/unlock_set_unlock_password_summary"

            android:persistent="false"/>



</PreferenceScreen>

src/com/android/settings/ChooseLockGeneric.java

+5 −2
Original line number Diff line number Diff line
@@ -58,6 +58,8 @@ public class ChooseLockGeneric extends PreferenceActivity { 
        private static final String CONFIRM_CREDENTIALS = "confirm_credentials";

        public static final String MINIMUM_QUALITY_KEY = "minimum_quality";



        private static final boolean ALWAY_SHOW_TUTORIAL = true;



        private ChooseLockSettingsHelper mChooseLockSettingsHelper;

        private DevicePolicyManager mDPM;

        private KeyStore mKeyStore;
@@ -282,7 +284,8 @@ public class ChooseLockGeneric extends PreferenceActivity { 
                    R.string.backup_lock_settings_picker_title);

            fallBackIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);



            boolean showTutorial = !mChooseLockSettingsHelper.utils().isBiometricWeakEverChosen();

            boolean showTutorial = ALWAY_SHOW_TUTORIAL ||

                    !mChooseLockSettingsHelper.utils().isBiometricWeakEverChosen();

            Intent intent = new Intent();

            intent.setClassName("com.android.facelock", showTutorial

                        ? "com.android.facelock.FaceLockTutorial"