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

Commit e7377fc7 authored by Austin Delgado's avatar Austin Delgado Committed by Automerger Merge Worker
Browse files

Merge "Fix talkback not announcing requirement in ChooseLock" into udc-qpr-dev... 

Merge "Fix talkback not announcing requirement in ChooseLock" into udc-qpr-dev am: fdb53691 am: 7f188438

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



Change-Id: I78f52d9f6a248cc9b0bb8461d97a63190a454f7e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 67544531 7f188438

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

+0 −1
Original line number Diff line number Diff line
@@ -524,7 +524,6 @@ public class ChooseLockPassword extends SettingsActivity { 
            setupPasswordRequirementsView(headerLayout);



            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.content.Context;

import android.view.LayoutInflater;

import android.view.View;
@@ -63,6 +64,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) {

        final int fontSize = mContext.getResources().getDimensionPixelSize(