From 58440b2801a5355e68f8950fc70f08a73e19e40d Mon Sep 17 00:00:00 2001
From: Clara Bayarri <clarabayarri@google.com>
Date: Wed, 27 Apr 2016 16:54:22 +0100
Subject: [PATCH] Fix Settings Condition expand button a11y label

Bug: 27276008
Change-Id: Ie62ed8a73b300948f053b5d35f344bce3b63869a
---
 res/values/strings.xml                                      | 6 ++++++
 .../dashboard/conditional/ConditionAdapterUtils.java        | 2 ++
 2 files changed, 8 insertions(+)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 99404e1d092..23a34886b27 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -7140,6 +7140,12 @@
     <!-- Turn on a conditional state of the device (e.g. cellular data) [CHAR LIMIT=30] -->
     <string name="condition_turn_on">Turn on</string>
 
+    <!-- Content description used when expanding a condition item to see more details -->
+    <string name="condition_expand_show">Show</string>
+
+    <!-- Content description used when collapsing a condition item to see less details -->
+    <string name="condition_expand_hide">Hide</string>
+
     <!-- Title of condition that hotspot is on [CHAR LIMIT=30] -->
     <string name="condition_hotspot_title">Hotspot is on</string>
 
diff --git a/src/com/android/settings/dashboard/conditional/ConditionAdapterUtils.java b/src/com/android/settings/dashboard/conditional/ConditionAdapterUtils.java
index 9a45a5a9164..51fd132fda2 100644
--- a/src/com/android/settings/dashboard/conditional/ConditionAdapterUtils.java
+++ b/src/com/android/settings/dashboard/conditional/ConditionAdapterUtils.java
@@ -71,6 +71,8 @@ public class ConditionAdapterUtils {
         ImageView expand = (ImageView) view.itemView.findViewById(R.id.expand_indicator);
         expand.setTag(condition);
         expand.setImageResource(isExpanded ? R.drawable.ic_expand_less : R.drawable.ic_expand_more);
+        expand.setContentDescription(expand.getContext().getString(isExpanded
+                ? R.string.condition_expand_hide : R.string.condition_expand_show));
         expand.setOnClickListener(onExpandListener);
 
         View detailGroup = view.itemView.findViewById(R.id.detail_group);