commit 597b3c648041401d443c6c442642fafcc34fb7f5
author Angela Wang <angelala@google.com> Wed Dec 18 20:38:58 2024 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Wed Dec 18 20:38:58 2024 -0800
tree 80fbf35cee82cc4e1455cbf5d467cae6d9921242
parent 5e390e57b55d42bff78ddb9fe4bdbebd3415298d
parent 59c0fd9012b6dfc12101e4f6a954571bc30da43f

Merge "Reset descriptions for SeekBarPreference" into main

src/com/android/settings/widget/SeekBarPreference.java

diff --git a/src/com/android/settings/widget/SeekBarPreference.java b/src/com/android/settings/widget/SeekBarPreference.java
index 3dd72f9..78f2fa5 100644
--- a/src/com/android/settings/widget/SeekBarPreference.java
+++ b/src/com/android/settings/widget/SeekBarPreference.java
@@ -142,9 +142,13 @@
             mSeekBar.setContentDescription(mSeekBarContentDescription);
         } else if (!TextUtils.isEmpty(title)) {
             mSeekBar.setContentDescription(title);
+        } else {
+            mSeekBar.setContentDescription(null);
         }
         if (!TextUtils.isEmpty(mSeekBarStateDescription)) {
             mSeekBar.setStateDescription(mSeekBarStateDescription);
+        } else {
+            mSeekBar.setStateDescription(null);
         }
         if (mSeekBar instanceof DefaultIndicatorSeekBar) {
             ((DefaultIndicatorSeekBar) mSeekBar).setDefaultProgress(mDefaultProgress);