From 3957d28a09d3023e05b7862e586271c53ca7216e Mon Sep 17 00:00:00 2001
From: Haijie Hong <hahong@google.com>
Date: Fri, 31 May 2024 19:12:47 +0800
Subject: [PATCH] Fix battery talkback for advanced bt header

Test: tested in phone
Bug: 323790433
Change-Id: I52ed8694af240ae7923d7758144e6db3c590571d
---
 res/layout/advanced_bt_entity_sub.xml | 4 +++-
 res/values/strings.xml                | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/res/layout/advanced_bt_entity_sub.xml b/res/layout/advanced_bt_entity_sub.xml
index 446bfd2f42b..d29c34f590e 100644
--- a/res/layout/advanced_bt_entity_sub.xml
+++ b/res/layout/advanced_bt_entity_sub.xml
@@ -20,6 +20,7 @@
     android:layout_width="0dp"
     android:layout_height="wrap_content"
     android:layout_weight="1"
+    android:focusable="true"
     android:orientation="vertical">
 
     <ImageView
@@ -54,7 +55,8 @@
         <ImageView
             android:id="@+id/bt_battery_icon"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"/>
+            android:layout_height="wrap_content"
+            android:contentDescription="@string/bluetooth_header_battery_content_description" />
         <TextView
             android:id="@+id/bt_battery_summary"
             style="@style/TextAppearance.EntityHeaderSummary"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index fa90d072fb3..6b093339f5a 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -12030,6 +12030,8 @@
     <string name="bluetooth_right_name">Right</string>
     <!-- Title for middle bluetooth device. [CHAR LIMIT=NONE] -->
     <string name="bluetooth_middle_name">Case</string>
+    <!-- Content description for battery icon in bluetooth header. [CHAR LIMIT=NONE] -->
+    <string name="bluetooth_header_battery_content_description">Battery</string>
 
     <!-- Default title for the settings panel [CHAR LIMIT=NONE] -->
     <string name="settings_panel_title">Settings Panel</string>