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

Commit 86a132bf authored by Mill Chen's avatar Mill Chen Committed by Android (Google) Code Review
Browse files

Merge changes I8c9b97fd,I5a2a6dfb into main 

* changes:
  Explicitly set SliderPreference as not clickable
  [Expressive] Update slider content description
parents bb98530b 128140a9

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

+12 −19
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ import android.util.Log; 
import android.view.KeyEvent;

import android.view.View;

import android.view.ViewGroup;

import android.view.accessibility.AccessibilityNodeInfo;

import android.widget.ImageView;

import android.widget.TextView;
@@ -331,6 +330,8 @@ public class SliderPreference extends Preference { 
    public void onBindViewHolder(@NonNull PreferenceViewHolder holder) {

        super.onBindViewHolder(holder);

        holder.itemView.setOnKeyListener(mSliderKeyListener);

        // SliderPreference is not clickable under normal conditions.

        holder.itemView.setClickable(false);

        mSlider = (Slider) holder.findViewById(R.id.slider);



        if (mSlider == null) {
@@ -354,11 +355,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);
@@ -410,16 +411,6 @@ public class SliderPreference extends Preference { 


        ImageView iconEndView = (ImageView) holder.findViewById(R.id.icon_end);

        updateIconEndIfNeeded(iconEndView);



        // Remove the accessibility label of click action

        holder.itemView.getRootView().setAccessibilityDelegate(new View.AccessibilityDelegate() {

            @Override

            public void onInitializeAccessibilityNodeInfo(View host, AccessibilityNodeInfo info) {

                super.onInitializeAccessibilityNodeInfo(host, info);

                info.removeAction(AccessibilityNodeInfo.ACTION_CLICK);

                info.setClickable(false);

            }

        });

    }



    /**
@@ -580,9 +571,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 +606,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();

        }

    }

packages/SettingsLib/src/com/android/settingslib/RestrictedSliderPreference.java

+5 −0
Original line number Diff line number Diff line
@@ -75,6 +75,11 @@ public class RestrictedSliderPreference extends SliderPreference implements 
    public void onBindViewHolder(@NonNull PreferenceViewHolder holder) {

        super.onBindViewHolder(holder);

        mHelper.onBindViewHolder(holder);

        if (mHelper.isDisabledByAdmin() || mHelper.isDisabledByEcm()) {

            // SliderPreference is not clickable under normal conditions, but it will become

            // clickable when the restriction is enabled.

            holder.itemView.setClickable(true);

        }

    }



    @SuppressLint("RestrictedApi")