diff options
| author | Dan Sandler <dsandler@android.com> | 2015-06-11 09:56:24 -0400 |
|---|---|---|
| committer | Dan Sandler <dsandler@android.com> | 2015-06-11 10:49:28 -0400 |
| commit | 187fe17bba06ca312e099ce67d49c9ee42b021fc (patch) | |
| tree | 493ffed39a336675ab3e58db1129d87c3f30db9d | |
| parent | 89124000c618f24b948505cd79f654aacbdff957 (diff) | |
| download | frameworks_base-187fe17bba06ca312e099ce67d49c9ee42b021fc.zip frameworks_base-187fe17bba06ca312e099ce67d49c9ee42b021fc.tar.gz frameworks_base-187fe17bba06ca312e099ce67d49c9ee42b021fc.tar.bz2 | |
A11y: Annotate the QS brightness slider properly.
Instead of just clobbering SeekBar's awesome feedback with
"Display brightness" right on the slider, we move that
string up to the parent and set it as the slider's label.
The new utterance will be: "<standard seekbar feedback> for
<label>", which in this case comes out as:
"Seek control, fifteen percent, for display brightness."
Bug: 20343730
Change-Id: I1223b3b07b6bf67ee3df22094ec5976b5188d968
3 files changed, 3 insertions, 1 deletions
diff --git a/packages/SystemUI/res/layout/quick_settings_brightness_dialog.xml b/packages/SystemUI/res/layout/quick_settings_brightness_dialog.xml index a996260..38ea6e1 100644 --- a/packages/SystemUI/res/layout/quick_settings_brightness_dialog.xml +++ b/packages/SystemUI/res/layout/quick_settings_brightness_dialog.xml @@ -35,6 +35,7 @@ android:layout_height="wrap_content" android:layout_gravity="center_vertical" android:layout_weight="1" + android:contentDescription="@string/accessibility_brightness" systemui:text="@string/status_bar_settings_auto_brightness_label" /> </LinearLayout> diff --git a/packages/SystemUI/res/layout/status_bar_toggle_slider.xml b/packages/SystemUI/res/layout/status_bar_toggle_slider.xml index a5bf68e..062e6cb 100644 --- a/packages/SystemUI/res/layout/status_bar_toggle_slider.xml +++ b/packages/SystemUI/res/layout/status_bar_toggle_slider.xml @@ -45,7 +45,6 @@ android:paddingBottom="16dp" android:thumb="@drawable/ic_brightness_thumb" android:splitTrack="false" - android:contentDescription="@string/accessibility_brightness" /> <TextView android:id="@+id/label" diff --git a/packages/SystemUI/src/com/android/systemui/settings/ToggleSlider.java b/packages/SystemUI/src/com/android/systemui/settings/ToggleSlider.java index 8abfe03..cdb8e69 100644 --- a/packages/SystemUI/src/com/android/systemui/settings/ToggleSlider.java +++ b/packages/SystemUI/src/com/android/systemui/settings/ToggleSlider.java @@ -74,6 +74,8 @@ public class ToggleSlider extends RelativeLayout { mLabel = (TextView) findViewById(R.id.label); mLabel.setText(a.getString(R.styleable.ToggleSlider_text)); + setLabelFor(R.id.slider); // use our a11y text to annotate, not replace, the slider's + a.recycle(); } |