Merge "A11y: Annotate the QS brightness slider properly." into mnc-dev

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>

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"

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();
     }