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

Merge "Pattern a11y fix" into main

Browse Source
This commit is contained in:
Joshua Mccloskey
2025-01-17 09:12:56 -08:00
committed by Android (Google) Code Review
parent 07eca37281 ab58cb91a9
commit 496dcd3eb7
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -348,9 +348,9 @@ public class ChooseLockPattern extends SettingsActivity {
*/ */
enum RightButtonMode { enum RightButtonMode {
Continue(R.string.next_label, true), Continue(R.string.next_label, true),
ContinueDisabled(R.string.next_label, false), ContinueDisabled(R.string.next_label, true),
Confirm(R.string.lockpattern_confirm_button_text, true), Confirm(R.string.lockpattern_confirm_button_text, true),
ConfirmDisabled(R.string.lockpattern_confirm_button_text, false), ConfirmDisabled(R.string.lockpattern_confirm_button_text, true),
Ok(android.R.string.ok, true); Ok(android.R.string.ok, true);
/** /**

2
tests/robotests/src/com/android/settings/password/SetupChooseLockPatternTest.java
View File

@@ -287,7 +287,6 @@ public class SetupChooseLockPatternTest {
final FooterButton nextButton = footerBarMixin.getPrimaryButton(); final FooterButton nextButton = footerBarMixin.getPrimaryButton();
assertThat(nextButton.getVisibility()).isEqualTo(View.VISIBLE); assertThat(nextButton.getVisibility()).isEqualTo(View.VISIBLE);
assertThat(nextButton.isEnabled()).isFalse();
enterPattern(); enterPattern();
@@ -333,7 +332,6 @@ public class SetupChooseLockPatternTest {
mContext.getString(R.string.lockpattern_need_to_unlock_wrong)); mContext.getString(R.string.lockpattern_need_to_unlock_wrong));
assertThat(nextButton.getText().toString()).isEqualTo( assertThat(nextButton.getText().toString()).isEqualTo(
mContext.getString(R.string.lockpattern_confirm_button_text)); mContext.getString(R.string.lockpattern_confirm_button_text));
assertThat(nextButton.isEnabled()).isFalse();
} }
@Test @Test