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

Commit aa7114cf authored by Sparik Hayrapetyan's avatar Sparik Hayrapetyan Committed by Android (Google) Code Review
Browse files

Merge "Change the message for sequential characters in a password" into main

parents 4764ef4b 37c371b1

res/values/strings.xml

+4 −1
Original line number Diff line number Diff line
@@ -1763,10 +1763,13 @@ 
    <string name="lockpassword_password_recently_used">Device admin doesn\'t allow using a recent

        password</string>









    <!-- [CHAR_LIMIT=NONE] Error shown when the user tries to set an ascending or descending sequence of digits -->









    <!-- [CHAR_LIMIT=NONE] Error shown when the user tries to set an ascending or descending sequence of digits as PIN -->









    <string name="lockpassword_pin_no_sequential_digits">Ascending, descending, or repeated sequence









        of digits isn\'t allowed</string>

















    <!-- Error shown when the user tries to set an ascending or descending sequence of alphanumeric characters in the password [CHAR_LIMIT=NONE] -->









    <string name="lockpassword_password_no_sequential_characters">Ascending, descending, or repeated sequence of characters isn\'t allowed</string>

















    <!-- Label for Confirm button when entering PIN / password the second time. [CHAR LIMIT=30] -->









    <string name="lockpassword_confirm_label">Confirm</string>

































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



+3
−1






























Original line number
Diff line number
Diff line







@@ -927,7 +927,9 @@ public class ChooseLockPassword extends SettingsActivity {







                                        : R.string.lockpassword_pin_too_long));









                        break;









                    case CONTAINS_SEQUENCE:









                        messages.add(getString(R.string.lockpassword_pin_no_sequential_digits));









                        messages.add(getString(mIsAlphaMode









                                ? R.string.lockpassword_password_no_sequential_characters









                                : R.string.lockpassword_pin_no_sequential_digits));









                        break;









                    case RECENTLY_USED:









                        DevicePolicyManager devicePolicyManager =
































tests/robotests/src/com/android/settings/password/ChooseLockPasswordTest.java



+2
−3






























Original line number
Diff line number
Diff line







@@ -71,7 +71,6 @@ import org.junit.Test;







import org.junit.runner.RunWith;









import org.robolectric.Robolectric;









import org.robolectric.RobolectricTestRunner;









import org.robolectric.Shadows;









import org.robolectric.annotation.Config;









import org.robolectric.shadows.ShadowDrawable;


















@@ -314,7 +313,7 @@ public class ChooseLockPasswordTest {







                /* minComplexity= */ PASSWORD_COMPLEXITY_NONE,









                /* passwordType= */ PASSWORD_QUALITY_ALPHABETIC,









                /* userEnteredPassword= */ LockscreenCredential.createPassword("12345678"),









                "Ascending, descending, or repeated sequence of digits isn't allowed");









                "Ascending, descending, or repeated sequence of characters isn't allowed");









    }



















    @Test








@@ -356,7 +355,7 @@ public class ChooseLockPasswordTest {







                /* minComplexity= */ PASSWORD_COMPLEXITY_LOW,









                /* passwordType= */ PASSWORD_QUALITY_ALPHABETIC,









                /* userEnteredPassword= */ LockscreenCredential.createPassword("12345678"),









                "Ascending, descending, or repeated sequence of digits isn't allowed");









                "Ascending, descending, or repeated sequence of characters isn't allowed");









    }



















    @Test