Merge "Fix QS accessibility issues" into nyc-dev am: 97e4c5e

am: 32e9ebe

* commit '32e9ebe7223ddc92a302fd6cbc53b8ce55fb4845':
  Fix QS accessibility issues

Change-Id: Ibb1c4838412d72c4e9f259ce1f75f7c9f6b92078

packages/SystemUI/res/layout/quick_status_bar_expanded_header.xml

@@ -84,6 +84,7 @@
             android:clickable="true"
             android:focusable="true"
             android:background="?android:attr/selectableItemBackgroundBorderless"
+            android:contentDescription="@string/accessibility_quick_settings_expand"
             android:padding="12dp" />
 
     </LinearLayout>

packages/SystemUI/res/values/strings.xml

@@ -1594,4 +1594,7 @@
     <!-- Warning message when we try to dock a non-resizeble tasks and launch it in fullscreen instead. -->
     <string name="dock_non_resizeble_failed_to_dock_text">App does not support split-screen.</string>
 
+    <!-- accessibility label for button to expand quick settings [CHAR LIMIT=NONE] -->
+    <string name="accessibility_quick_settings_expand">Expand quick settings.</string>
+
 </resources>

packages/SystemUI/src/com/android/systemui/qs/tiles/BatteryTile.java

@@ -130,6 +130,8 @@ public class BatteryTile extends QSTile<QSTile.State> implements BatteryControll
             }
         };
         state.label = percentage;
+        state.contentDescription = mContext.getString(R.string.accessibility_quick_settings_battery,
+                percentage);
     }
 
     @Override