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

Commit 940407eb authored by Danielle Millett's avatar Danielle Millett
Browse files

Changed header to specify backup lock 

-Changed main header to show backup lock text
-Reworded normal header
-Changed instances of FacePass to FaceLock

Change-Id: I66cbd3ada87df30b6b7ceb1a784d365ba60a8f41
parent 9fe945b8

res/values/strings.xml

+3 −3
Original line number Diff line number Diff line
@@ -764,7 +764,7 @@ 


    <!-- Security Picker --><skip />

    <!--  Title for security picker to choose the unlock method: None/Pattern/PIN/Password [CHAR LIMIT=22] -->

    <string name="lock_settings_picker_title">Screen lock</string>

    <string name="lock_settings_picker_title">Select screen lock</string>



    <!--  Title for security picker when choosing a facelock's backup unlock method: Pattern/PIN [CHAR LIMIT=22] -->

    <string name="backup_lock_settings_picker_title">Choose backup lock</string>
@@ -796,7 +796,7 @@ 
    <string name="unlock_set_unlock_none_summary">No security</string>



    <!-- Title for preference that guides the user through a weak biometric lock [CHAR LIMIT=22] -->

    <string name="unlock_set_unlock_biometric_weak_title">FacePass</string>

    <string name="unlock_set_unlock_biometric_weak_title">FaceLock</string>

    <!-- Summary for preference that disables unlock security [CHAR LIMIT=45]-->

    <string name="unlock_set_unlock_biometric_weak_summary">Low security, experimental</string>
@@ -823,7 +823,7 @@ 
    <!-- Summary for "Configure lockscreen" when security is disabled [CHAR LIMIT=45] -->

    <string name="unlock_set_unlock_mode_none">Slide</string>

    <!-- Summary for "Configure lockscreen" when security biometric weak is enabled [CHAR LIMIT=45] -->

    <string name="unlock_set_unlock_mode_biometric_weak">FacePass</string>

    <string name="unlock_set_unlock_mode_biometric_weak">FaceLock</string>

    <!-- Summary for "Configure lockscreen" when security pattern is enabled [CHAR LIMIT=45] -->

    <string name="unlock_set_unlock_mode_pattern">Secured with pattern</string>

    <!-- Summary for "Configure lockscreen" when security PIN is enabled [CHAR LIMIT=45] -->

src/com/android/settings/ChooseLockGeneric.java

+3 −0
Original line number Diff line number Diff line
@@ -213,6 +213,7 @@ public class ChooseLockGeneric extends PreferenceActivity { 
                    .getBooleanExtra(LockPatternUtils.LOCKSCREEN_BIOMETRIC_WEAK_FALLBACK, false);

            final boolean weakBiometricAvailable = isBiometricSensorAvailable(

                    DevicePolicyManager.PASSWORD_QUALITY_BIOMETRIC_WEAK);

            // TODO: This code can be removed once the second header is gone

            if (onlyShowFallback) {

                picker.setTitle(R.string.backup_lock_settings_picker_title);

            } else {
@@ -271,6 +272,8 @@ public class ChooseLockGeneric extends PreferenceActivity { 
            Intent fallBackIntent = new Intent().setClass(getActivity(), ChooseLockGeneric.class);

            fallBackIntent.putExtra(LockPatternUtils.LOCKSCREEN_BIOMETRIC_WEAK_FALLBACK, true);

            fallBackIntent.putExtra(CONFIRM_CREDENTIALS, false);

            fallBackIntent.putExtra(EXTRA_SHOW_FRAGMENT_TITLE,

                    R.string.backup_lock_settings_picker_title);

            fallBackIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);



            Intent intent = new Intent().setClassName("com.android.facelock",