summaryrefslogtreecommitdiffstats
path: root/packages/SystemUI/res
diff options
context:
space:
mode:
authorDan Sandler <dsandler@android.com>2015-06-11 14:55:00 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-06-11 14:55:02 +0000
commit31ae9936a63f484dd872baa7657c4ce79f27d7ce (patch)
tree134be05966e52220f565db03ab37f8300221f1e3 /packages/SystemUI/res
parent08f247fe2e073a5ec62dc0469d83f514aab31c42 (diff)
parent187fe17bba06ca312e099ce67d49c9ee42b021fc (diff)
downloadframeworks_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/SystemUI/res')
-rw-r--r--packages/SystemUI/res/layout/quick_settings_brightness_dialog.xml1
-rw-r--r--packages/SystemUI/res/layout/status_bar_toggle_slider.xml1
2 files changed, 1 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"