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

Commit 3a0b89b3 authored by Jason Hsu's avatar Jason Hsu Committed by Automerger Merge Worker
Browse files

Merge "Fix talkback did not speak out ReplacementSpan's content description."... 

Merge "Fix talkback did not speak out ReplacementSpan's content description." into rvc-dev am: dac6071a am: 5684903d

Change-Id: Iba7009580285d88c01ebf15d01c096e8a2ce8ae9
parents 21c3e399 5684903d

core/java/android/text/TextUtils.java

+1 −1
Original line number Diff line number Diff line
@@ -738,7 +738,7 @@ public class TextUtils { 
    /** @hide */

    public static final int ACCESSIBILITY_REPLACEMENT_SPAN = 29;

    /** @hide */

    public static final int LAST_SPAN = LINE_HEIGHT_SPAN;

    public static final int LAST_SPAN = ACCESSIBILITY_REPLACEMENT_SPAN;



    /**

     * Flatten a CharSequence and whatever styles can be copied across processes

core/java/android/text/style/AccessibilityReplacementSpan.java

+13 −8
Original line number Diff line number Diff line
@@ -22,30 +22,35 @@ import android.os.Parcel; 
import android.os.Parcelable;

import android.text.ParcelableSpan;

import android.text.TextUtils;

import android.view.accessibility.AccessibilityNodeInfo;



/**

 * This class serves as a parcelable placeholder for the ReplacementSpans.

 * This class serves as a parcelable placeholder for the {@link ReplacementSpan}.

 *

 * This span contains content description of original span to let Accessibility service to do the

 * substitution for it.

 * It is used to replace ReplacementSpans in {@link AccessibilityNodeInfo#setText(CharSequence)}.

 *

 * @hide

 */

public class AccessibilityReplacementSpan extends ReplacementSpan

        implements ParcelableSpan {

    // The content description of the span this one replaces

    private CharSequence mContentDescription;



    /**

     * Sets the content description to the parent class.

     *

     * @param contentDescription The content description of the span this one replaces

     */

    public AccessibilityReplacementSpan(CharSequence contentDescription) {

        this.setContentDescription(contentDescription);

        mContentDescription = contentDescription;

    }



    /**

     * Sets the content description to the parent class.

     *

     * @param p The parcel to de-serialize from

     */

    public AccessibilityReplacementSpan(Parcel p) {

        mContentDescription = p.readCharSequence();

        final CharSequence contentDescription = p.readCharSequence();

        this.setContentDescription(contentDescription);

    }



    @Override
@@ -70,7 +75,7 @@ public class AccessibilityReplacementSpan extends ReplacementSpan 


    @Override

    public void writeToParcelInternal(Parcel dest, int flags) {

        dest.writeCharSequence(mContentDescription);

        dest.writeCharSequence(this.getContentDescription());

    }



    @Override