From a73cee24d4bb2f1eab029d42f981d672044ef775 Mon Sep 17 00:00:00 2001 From: Austin Delgado Date: Mon, 21 Aug 2023 10:14:55 -0700 Subject: [PATCH] Fix talkback not announcing requirement in ChooseLock Fix: 281955512 Test: Manual, verify talkback reads out password requirement on 17th digit Change-Id: Ia274af9cc515d3ac9d344bd41d008ab5b4dbcabd Merged-In: Ia274af9cc515d3ac9d344bd41d008ab5b4dbcabd --- src/com/android/settings/password/ChooseLockPassword.java | 1 - .../settings/password/PasswordRequirementAdapter.java | 6 ++++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/com/android/settings/password/ChooseLockPassword.java b/src/com/android/settings/password/ChooseLockPassword.java index a72bff47ab0..16c4f5bb1ab 100644 --- a/src/com/android/settings/password/ChooseLockPassword.java +++ b/src/com/android/settings/password/ChooseLockPassword.java @@ -520,7 +520,6 @@ public class ChooseLockPassword extends SettingsActivity { setupPasswordRequirementsView(view); mPasswordRestrictionView.setLayoutManager(new LinearLayoutManager(getActivity())); - mPasswordRestrictionView.setAccessibilityLiveRegion(ACCESSIBILITY_LIVE_REGION_POLITE); mPasswordEntry = view.findViewById(R.id.password_entry); mPasswordEntry.setOnEditorActionListener(this); mPasswordEntry.addTextChangedListener(this); diff --git a/src/com/android/settings/password/PasswordRequirementAdapter.java b/src/com/android/settings/password/PasswordRequirementAdapter.java index 0e194afca16..a21a3f42b90 100644 --- a/src/com/android/settings/password/PasswordRequirementAdapter.java +++ b/src/com/android/settings/password/PasswordRequirementAdapter.java @@ -16,6 +16,7 @@ package com.android.settings.password; +import android.annotation.NonNull; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -59,6 +60,11 @@ public class PasswordRequirementAdapter extends return mRequirements[position].hashCode(); } + @Override + public void onViewAttachedToWindow(@NonNull PasswordRequirementViewHolder holder) { + holder.mDescriptionText.announceForAccessibility(holder.mDescriptionText.getText()); + } + @Override public void onBindViewHolder(PasswordRequirementViewHolder holder, int position) { holder.mDescriptionText.setText(mRequirements[position]);