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

Commit 798253e1 authored by Alan Viverette's avatar Alan Viverette
Browse files

Expose password text to accessibility services, if requested 

Otherwise, exposes the hint or the result of whatever transformation
method is set. This is consistent with what is displayed visually.

Bug: 23568127
Change-Id: Ib5c7fe78fb3b58feb36f0314638345bd40e401ab
parent 306a1d22

core/java/android/widget/TextView.java

+25 −19
Original line number Diff line number Diff line
@@ -8765,14 +8765,11 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener 
    public void onPopulateAccessibilityEventInternal(AccessibilityEvent event) {

        super.onPopulateAccessibilityEventInternal(event);



        final boolean isPassword = hasPasswordTransformationMethod();

        if (!isPassword || shouldSpeakPasswordsForAccessibility()) {

        final CharSequence text = getTextForAccessibility();

        if (!TextUtils.isEmpty(text)) {

            event.getText().add(text);

        }

    }

    }



    /**

     * @return true if the user has explicitly allowed accessibility services
@@ -8921,10 +8918,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener 


        final boolean isPassword = hasPasswordTransformationMethod();

        info.setPassword(isPassword);



        if (!isPassword || shouldSpeakPasswordsForAccessibility()) {

        info.setText(getTextForAccessibility());

        }



        if (mBufferType == BufferType.EDITABLE) {

            info.setEditable(true);
@@ -9156,18 +9150,30 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener 
    }



    /**

     * Gets the text reported for accessibility purposes.

     *

     * @return The accessibility text.

     * Returns the text that should be exposed to accessibility services.

     * <p>

     * This approximates what is displayed visually. If the user has specified

     * that accessibility services should speak passwords, this method will

     * bypass any password transformation method and return unobscured text.

     *

     * @hide

     * @return the text that should be exposed to accessibility services, may

     *         be {@code null} if no text is set

     */

    public CharSequence getTextForAccessibility() {

        CharSequence text = getText();

        if (TextUtils.isEmpty(text)) {

            text = getHint();

    @Nullable

    private CharSequence getTextForAccessibility() {

        // If the text is empty, we must be showing the hint text.

        if (TextUtils.isEmpty(mText)) {

            return mHint;

        }

        return text;



        // Check whether we need to bypass the transformation

        // method and expose unobscured text.

        if (hasPasswordTransformationMethod() && shouldSpeakPasswordsForAccessibility()) {

            return mText;

        }



        // Otherwise, speak whatever text is being displayed.

        return mTransformed;

    }



    void sendAccessibilityEventTypeViewTextChanged(CharSequence beforeText,