From cbfe1eb881028d06aee9720634bbdbc4ef17e71a Mon Sep 17 00:00:00 2001
From: Fan Zhang <zhfan@google.com>
Date: Tue, 16 May 2017 10:50:59 -0700
Subject: [PATCH] Add title to SeekbarPreference content description.

Adding a title to contentDesciption of the seekbar.
The title is helpful to indicate which seekbar user is changing when
talkback is enabled.

Also move SeekBarPreference from root package to widget packge.

Change-Id: I793f41c4902e350b6bc6d62761362779cc3722a9
Fix: 35421942
Test: make RunSettingsRoboTests
---
 res/xml/accessibility_autoclick_settings.xml               | 2 +-
 res/xml/assist_gesture_settings.xml                        | 2 +-
 res/xml/night_display_settings.xml                         | 2 +-
 res/xml/tts_settings.xml                                   | 4 ++--
 .../accessibility/ToggleAutoclickPreferenceFragment.java   | 2 +-
 src/com/android/settings/display/NightDisplaySettings.java | 2 +-
 .../AssistGestureSensitivityPreferenceController.java      | 2 +-
 .../settings/notification/VolumeSeekBarPreference.java     | 2 +-
 src/com/android/settings/tts/TextToSpeechSettings.java     | 2 +-
 .../android/settings/{ => widget}/SeekBarPreference.java   | 7 ++++++-
 10 files changed, 16 insertions(+), 11 deletions(-)
 rename src/com/android/settings/{ => widget}/SeekBarPreference.java (97%)

diff --git a/res/xml/accessibility_autoclick_settings.xml b/res/xml/accessibility_autoclick_settings.xml
index f774335705b..6bd6c4dd709 100644
--- a/res/xml/accessibility_autoclick_settings.xml
+++ b/res/xml/accessibility_autoclick_settings.xml
@@ -18,7 +18,7 @@
                   android:title="@string/accessibility_autoclick_preference_title">
 
 
-    <com.android.settings.SeekBarPreference
+    <com.android.settings.widget.SeekBarPreference
         android:key="autoclick_delay"
         android:title="@string/accessibility_autoclick_delay_preference_title"/>
 
diff --git a/res/xml/assist_gesture_settings.xml b/res/xml/assist_gesture_settings.xml
index 52ee247970f..2cc5189d37b 100644
--- a/res/xml/assist_gesture_settings.xml
+++ b/res/xml/assist_gesture_settings.xml
@@ -29,7 +29,7 @@
         android:title="@string/assist_gesture_title"
         android:summary="@string/assist_gesture_summary" />
 
-    <com.android.settings.SeekBarPreference
+    <com.android.settings.widget.SeekBarPreference
         android:key="gesture_assist_sensitivity"
         android:title="@string/assist_gesture_sensitivity_title"
         android:defaultValue="2"
diff --git a/res/xml/night_display_settings.xml b/res/xml/night_display_settings.xml
index f78a7694de6..5374b084989 100644
--- a/res/xml/night_display_settings.xml
+++ b/res/xml/night_display_settings.xml
@@ -43,7 +43,7 @@
                 android:key="night_display_activated"
                 android:title="@string/night_display_title" />
 
-        <com.android.settings.SeekBarPreference
+        <com.android.settings.widget.SeekBarPreference
             android:key="night_display_temperature"
             android:title="@string/night_display_temperature_title"/>
 
diff --git a/res/xml/tts_settings.xml b/res/xml/tts_settings.xml
index 78c4c449b0d..c141dad1ed1 100644
--- a/res/xml/tts_settings.xml
+++ b/res/xml/tts_settings.xml
@@ -37,14 +37,14 @@
 
         <!-- The max value for seek bars here should be kept in sync
              with the max value specified in TextToSpeechSettings class. -->
-        <com.android.settings.SeekBarPreference
+        <com.android.settings.widget.SeekBarPreference
             android:key="tts_default_rate"
             android:title="@string/tts_default_rate_title"
             android:summary="@string/tts_default_rate_summary"
             android:defaultValue="50"
             android:max="600"/>
 
-        <com.android.settings.SeekBarPreference
+        <com.android.settings.widget.SeekBarPreference
             android:key="tts_default_pitch"
             android:title="@string/tts_default_pitch_title"
             android:summary="@string/tts_default_pitch_summary"
diff --git a/src/com/android/settings/accessibility/ToggleAutoclickPreferenceFragment.java b/src/com/android/settings/accessibility/ToggleAutoclickPreferenceFragment.java
index 6b2c6c8015d..b3d826669fd 100644
--- a/src/com/android/settings/accessibility/ToggleAutoclickPreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleAutoclickPreferenceFragment.java
@@ -26,7 +26,7 @@ import android.widget.Switch;
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
-import com.android.settings.SeekBarPreference;
+import com.android.settings.widget.SeekBarPreference;
 import com.android.settings.widget.SwitchBar;
 
 
diff --git a/src/com/android/settings/display/NightDisplaySettings.java b/src/com/android/settings/display/NightDisplaySettings.java
index 1da16fe11c9..799ab2d1408 100644
--- a/src/com/android/settings/display/NightDisplaySettings.java
+++ b/src/com/android/settings/display/NightDisplaySettings.java
@@ -28,7 +28,7 @@ import android.widget.TimePicker;
 import com.android.internal.app.NightDisplayController;
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
-import com.android.settings.SeekBarPreference;
+import com.android.settings.widget.SeekBarPreference;
 import com.android.settings.SettingsPreferenceFragment;
 
 import java.text.DateFormat;
diff --git a/src/com/android/settings/gestures/AssistGestureSensitivityPreferenceController.java b/src/com/android/settings/gestures/AssistGestureSensitivityPreferenceController.java
index 3b4143468ad..0f428033fc5 100644
--- a/src/com/android/settings/gestures/AssistGestureSensitivityPreferenceController.java
+++ b/src/com/android/settings/gestures/AssistGestureSensitivityPreferenceController.java
@@ -24,7 +24,7 @@ import android.provider.Settings;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceScreen;
 
-import com.android.settings.SeekBarPreference;
+import com.android.settings.widget.SeekBarPreference;
 import com.android.settings.core.PreferenceController;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settingslib.core.lifecycle.Lifecycle;
diff --git a/src/com/android/settings/notification/VolumeSeekBarPreference.java b/src/com/android/settings/notification/VolumeSeekBarPreference.java
index 8a51961dca2..63390089430 100644
--- a/src/com/android/settings/notification/VolumeSeekBarPreference.java
+++ b/src/com/android/settings/notification/VolumeSeekBarPreference.java
@@ -31,7 +31,7 @@ import android.widget.SeekBar;
 import android.widget.TextView;
 
 import com.android.settings.R;
-import com.android.settings.SeekBarPreference;
+import com.android.settings.widget.SeekBarPreference;
 
 import java.util.Objects;
 
diff --git a/src/com/android/settings/tts/TextToSpeechSettings.java b/src/com/android/settings/tts/TextToSpeechSettings.java
index 0dfdab6bebe..e8823a6388e 100644
--- a/src/com/android/settings/tts/TextToSpeechSettings.java
+++ b/src/com/android/settings/tts/TextToSpeechSettings.java
@@ -36,7 +36,7 @@ import java.util.Collections;
 import com.android.settings.applications.LayoutPreference;
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.settings.SeekBarPreference;
+import com.android.settings.widget.SeekBarPreference;
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
 import com.android.settings.SettingsPreferenceFragment;
diff --git a/src/com/android/settings/SeekBarPreference.java b/src/com/android/settings/widget/SeekBarPreference.java
similarity index 97%
rename from src/com/android/settings/SeekBarPreference.java
rename to src/com/android/settings/widget/SeekBarPreference.java
index a8d5fbf6729..4ab1af282fe 100644
--- a/src/com/android/settings/SeekBarPreference.java
+++ b/src/com/android/settings/widget/SeekBarPreference.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings;
+package com.android.settings.widget;
 
 import android.content.Context;
 import android.content.res.TypedArray;
@@ -22,6 +22,7 @@ import android.os.Parcel;
 import android.os.Parcelable;
 import android.support.v4.content.res.TypedArrayUtils;
 import android.support.v7.preference.PreferenceViewHolder;
+import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.view.KeyEvent;
 import android.view.View;
@@ -89,6 +90,10 @@ public class SeekBarPreference extends RestrictedPreference
         mSeekBar.setMax(mMax);
         mSeekBar.setProgress(mProgress);
         mSeekBar.setEnabled(isEnabled());
+        final CharSequence title = getTitle();
+        if (!TextUtils.isEmpty(title)) {
+            mSeekBar.setContentDescription(title);
+        }
         if (mSeekBar instanceof DefaultIndicatorSeekBar) {
             ((DefaultIndicatorSeekBar) mSeekBar).setDefaultProgress(mDefaultProgress);
         }