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

Commit d27e383e authored by Joe Bolinger's avatar Joe Bolinger Committed by Android (Google) Code Review
Browse files

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

parents 113ac8d1 a73cee24
Loading
Loading
Loading
Loading
+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);
+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]);