Merge "Fix battery talkback for advanced bt header" into main

This commit is contained in:
Haijie Hong
2024-06-05 05:13:33 +00:00
committed by Android (Google) Code Review
2 changed files with 5 additions and 1 deletions

View File

@@ -20,6 +20,7 @@
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
android:focusable="true"
android:orientation="vertical"> android:orientation="vertical">
<ImageView <ImageView
@@ -54,7 +55,8 @@
<ImageView <ImageView
android:id="@+id/bt_battery_icon" android:id="@+id/bt_battery_icon"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content"/> android:layout_height="wrap_content"
android:contentDescription="@string/bluetooth_header_battery_content_description" />
<TextView <TextView
android:id="@+id/bt_battery_summary" android:id="@+id/bt_battery_summary"
style="@style/TextAppearance.EntityHeaderSummary" style="@style/TextAppearance.EntityHeaderSummary"

View File

@@ -12052,6 +12052,8 @@
<string name="bluetooth_right_name">Right</string> <string name="bluetooth_right_name">Right</string>
<!-- Title for middle bluetooth device. [CHAR LIMIT=NONE] --> <!-- Title for middle bluetooth device. [CHAR LIMIT=NONE] -->
<string name="bluetooth_middle_name">Case</string> <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] --> <!-- Default title for the settings panel [CHAR LIMIT=NONE] -->
<string name="settings_panel_title">Settings Panel</string> <string name="settings_panel_title">Settings Panel</string>