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

Commit 496dcd3e authored by Joshua Mccloskey's avatar Joshua Mccloskey Committed by Android (Google) Code Review
Browse files

Merge "Pattern a11y fix" into main

parents 07eca372 ab58cb91

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

+2 −2
Original line number Diff line number Diff line
@@ -348,9 +348,9 @@ public class ChooseLockPattern extends SettingsActivity { 
         */

        enum RightButtonMode {

            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),

            ConfirmDisabled(R.string.lockpattern_confirm_button_text, false),

            ConfirmDisabled(R.string.lockpattern_confirm_button_text, true),

            Ok(android.R.string.ok, true);



            /**

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

+0 −2
Original line number Diff line number Diff line
@@ -287,7 +287,6 @@ public class SetupChooseLockPatternTest { 
        final FooterButton nextButton = footerBarMixin.getPrimaryButton();



        assertThat(nextButton.getVisibility()).isEqualTo(View.VISIBLE);

        assertThat(nextButton.isEnabled()).isFalse();



        enterPattern();
@@ -333,7 +332,6 @@ public class SetupChooseLockPatternTest { 
                mContext.getString(R.string.lockpattern_need_to_unlock_wrong));

        assertThat(nextButton.getText().toString()).isEqualTo(

                mContext.getString(R.string.lockpattern_confirm_button_text));

        assertThat(nextButton.isEnabled()).isFalse();

    }



    @Test