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

Commit eda5cd1c authored by Mill Chen's avatar Mill Chen
Browse files

[Expressive] Update slider content description 

The content description for SliderPreference is now set on
holder.itemView instead of just the internal slider widget. When the
slider content description is updated, notifyChanged is called to ensure
the view is re-bound with the new description.

Bug: 436524151
Test: manual test with Talkback
Flag: EXEMPT bugfix for accessibility
Change-Id: I5a2a6dfb9e8f5d8f3f3504a9372c8f9e25261bb9
parent 09c4bd85

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

+10 −8
Original line number Diff line number Diff line
@@ -354,11 +354,11 @@ public class SliderPreference extends Preference { 
        }

        final CharSequence title = getTitle();

        if (!TextUtils.isEmpty(mSliderContentDescription)) {

            mSlider.setContentDescription(mSliderContentDescription);

            holder.itemView.setContentDescription(mSliderContentDescription);

        } else if (!TextUtils.isEmpty(title)) {

            mSlider.setContentDescription(title);

            holder.itemView.setContentDescription(title);

        } else {

            mSlider.setContentDescription(null);

            holder.itemView.setContentDescription(null);

        }

        if (!TextUtils.isEmpty(mSliderStateDescription)) {

            mSlider.setStateDescription(mSliderStateDescription);
@@ -580,9 +580,11 @@ public class SliderPreference extends Preference { 
     * @see #getShowSliderValue()

     */

    public void setShowSliderValue(boolean showSliderValue) {

        if (showSliderValue != mShowSliderValue) {

            mShowSliderValue = showSliderValue;

            notifyChanged();

        }

    }



    public void setLabelFormater(@Nullable LabelFormatter formater) {

        mLabelFormater = formater;
@@ -613,9 +615,9 @@ public class SliderPreference extends Preference { 
     * @param contentDescription The content description of the {@link Slider}

     */

    public void setSliderContentDescription(@Nullable CharSequence contentDescription) {

        if (!TextUtils.equals(contentDescription, mSliderContentDescription)) {

            mSliderContentDescription = contentDescription;

        if (mSlider != null) {

            mSlider.setContentDescription(contentDescription);

            notifyChanged();

        }

    }