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

Commit 641db014 authored by Edgar Wang's avatar Edgar Wang Committed by Automerger Merge Worker
Browse files

Merge "Fix link number increasing in the TalkBack menu." into sc-v2-dev am: 25273478 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15926307

Change-Id: Ia20300e9b022f9ba58147b293c807f5b7d8ae417
parents c9d18999 25273478

packages/SettingsLib/FooterPreference/src/com/android/settingslib/widget/FooterPreference.java

+6 −1
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ public class FooterPreference extends Preference { 
    View.OnClickListener mLearnMoreListener;

    private CharSequence mContentDescription;

    private CharSequence mLearnMoreContentDescription;

    private FooterLearnMoreSpan mLearnMoreSpan;



    public FooterPreference(Context context, AttributeSet attrs) {

        super(context, attrs, R.attr.footerPreferenceStyle);
@@ -68,7 +69,11 @@ public class FooterPreference extends Preference { 
        if (learnMore != null && mLearnMoreListener != null) {

            learnMore.setVisibility(View.VISIBLE);

            SpannableString learnMoreText = new SpannableString(learnMore.getText());

            learnMoreText.setSpan(new FooterLearnMoreSpan(mLearnMoreListener), 0,

            if (mLearnMoreSpan != null) {

                learnMoreText.removeSpan(mLearnMoreSpan);

            }

            mLearnMoreSpan = new FooterLearnMoreSpan(mLearnMoreListener);

            learnMoreText.setSpan(mLearnMoreSpan, 0,

                    learnMoreText.length(), 0);

            learnMore.setText(learnMoreText);

            if (!TextUtils.isEmpty(mLearnMoreContentDescription)) {