PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Sparik Hayrapetyan
2024-09-18 16:59:47 +00:00
committed by Android (Google) Code Review
parent 4764ef4bf1 37c371b1bb
commit aa7114cf3e
3 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
res/values/strings.xml
View File

@@ -1763,10 +1763,13 @@
<string name="lockpassword_password_recently_used">Device admin doesn\'t allow using a recent <string name="lockpassword_password_recently_used">Device admin doesn\'t allow using a recent
password</string> 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 <string name="lockpassword_pin_no_sequential_digits">Ascending, descending, or repeated sequence
of digits isn\'t allowed</string> 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] --> <!-- Label for Confirm button when entering PIN / password the second time. [CHAR LIMIT=30] -->
<string name="lockpassword_confirm_label">Confirm</string> <string name="lockpassword_confirm_label">Confirm</string>

4
src/com/android/settings/password/ChooseLockPassword.java
View File

@@ -927,7 +927,9 @@ public class ChooseLockPassword extends SettingsActivity {
: R.string.lockpassword_pin_too_long)); : R.string.lockpassword_pin_too_long));
break; break;
case CONTAINS_SEQUENCE: 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; break;
case RECENTLY_USED: case RECENTLY_USED:
DevicePolicyManager devicePolicyManager = DevicePolicyManager devicePolicyManager =

5
tests/robotests/src/com/android/settings/password/ChooseLockPasswordTest.java
View File

@@ -71,7 +71,6 @@ import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.robolectric.Robolectric; import org.robolectric.Robolectric;
import org.robolectric.RobolectricTestRunner; import org.robolectric.RobolectricTestRunner;
import org.robolectric.Shadows;
import org.robolectric.annotation.Config; import org.robolectric.annotation.Config;
import org.robolectric.shadows.ShadowDrawable; import org.robolectric.shadows.ShadowDrawable;
@@ -314,7 +313,7 @@ public class ChooseLockPasswordTest {
/* minComplexity= */ PASSWORD_COMPLEXITY_NONE, /* minComplexity= */ PASSWORD_COMPLEXITY_NONE,
/* passwordType= */ PASSWORD_QUALITY_ALPHABETIC, /* passwordType= */ PASSWORD_QUALITY_ALPHABETIC,
/* userEnteredPassword= */ LockscreenCredential.createPassword("12345678"), /* 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 @Test
@@ -356,7 +355,7 @@ public class ChooseLockPasswordTest {
/* minComplexity= */ PASSWORD_COMPLEXITY_LOW, /* minComplexity= */ PASSWORD_COMPLEXITY_LOW,
/* passwordType= */ PASSWORD_QUALITY_ALPHABETIC, /* passwordType= */ PASSWORD_QUALITY_ALPHABETIC,
/* userEnteredPassword= */ LockscreenCredential.createPassword("12345678"), /* 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 @Test