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

Commit cadc70a0 authored by Joe Bolinger's avatar Joe Bolinger Committed by Automerger Merge Worker
Browse files

Merge "Fix talkback not announcing requirement in ChooseLock" into udc-d1-dev am: d27e383e 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24498831



Change-Id: Ie403cfa86823a7d53fab020cd1019cb9d83a2698
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9517e0e2 d27e383e

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

+0 −1
Original line number Diff line number Diff line
@@ -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);

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

+6 −0
Original line number Diff line number Diff line
@@ -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]);