diff options
| author | Dan Sandler <dsandler@android.com> | 2015-06-11 14:55:00 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-11 14:55:02 +0000 |
| commit | 31ae9936a63f484dd872baa7657c4ce79f27d7ce (patch) | |
| tree | 134be05966e52220f565db03ab37f8300221f1e3 /packages | |
| parent | 08f247fe2e073a5ec62dc0469d83f514aab31c42 (diff) | |
| parent | 187fe17bba06ca312e099ce67d49c9ee42b021fc (diff) | |
| download | frameworks_base-31ae9936a63f484dd872baa7657c4ce79f27d7ce.zip frameworks_base-31ae9936a63f484dd872baa7657c4ce79f27d7ce.tar.gz frameworks_base-31ae9936a63f484dd872baa7657c4ce79f27d7ce.tar.bz2 | |
Merge "A11y: Annotate the QS brightness slider properly." into mnc-dev
Diffstat (limited to 'packages')
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(); } |