Merge "Set the talkback focus to the header text when Stage is NeedToConfirm" into udc-dev

2023-05-09 02:11:48 +00:00
parent ee54d713d5 4fef3fac2c
commit f5b4a2388d
1 changed files with 6 additions and 1 deletions
--- a/src/com/android/settings/password/ChooseLockPattern.java
+++ b/src/com/android/settings/password/ChooseLockPattern.java
@@ -798,7 +798,12 @@ public class ChooseLockPattern extends SettingsActivity {
            // If the stage changed, announce the header for accessibility. This
            // is a no-op when accessibility is disabled.
            if (previousStage != stage || announceAlways) {
-                mHeaderText.announceForAccessibility(mHeaderText.getText());
+                if (stage == Stage.NeedToConfirm) {
+                    // If the Stage is NeedToConfirm, move the a11y focus to the header.
+                    mHeaderText.requestAccessibilityFocus();
+                } else {
+                    mHeaderText.announceForAccessibility(mHeaderText.getText());
+                }
            }
        }