PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix a11y label for LE Audio Battery" into tm-dev am: 22cda47705 am: 5f99fad806 am: 58b70b17f7

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18090791

Change-Id: Icef10a7cb3d44549205b59b1deba40e89e4aabb2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Chaohui Wang
2022-05-04 10:29:39 +00:00
committed by Automerger Merge Worker
parent 4c0fb11316 58b70b17f7
commit 705c447e92
3 changed files with 76 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

86
res/layout/le_audio_bt_entity_header.xml
View File

@@ -61,75 +61,91 @@
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:gravity="center_vertical"
android:orientation="horizontal">
android:orientation="vertical">
<LinearLayout
android:layout_width="wrap_content"
android:id="@+id/bt_battery_case"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/le_bluetooth_battery_start_margin"
android:orientation="vertical">
android:layout_marginTop="@dimen/le_bluetooth_battery_top_margin"
android:orientation="horizontal"
android:visibility="gone"
android:focusable="true">
<TextView
android:id="@+id/bt_battery_case_title"
style="@style/TextAppearance.EntityHeaderTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/le_bluetooth_battery_top_margin"
android:layout_weight="1"
android:gravity="start|center_vertical"
android:ellipsize="end"
android:textDirection="locale"
android:text="@string/bluetooth_middle_name"
android:textSize="@dimen/advanced_bluetooth_header_title_text_size"
android:visibility="gone"/>
android:textSize="@dimen/advanced_bluetooth_header_title_text_size"/>
<TextView
android:id="@+id/bt_battery_case_summary"
style="@style/TextAppearance.EntityHeaderSummary"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/le_bluetooth_summary_start_margin"
android:minWidth="@dimen/le_bluetooth_summary_min_width"
android:padding="@dimen/le_bluetooth_summary_padding"
android:drawablePadding="@dimen/le_bluetooth_summary_drawable_padding"/>
</LinearLayout>
<LinearLayout
android:id="@+id/bt_battery_left"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/le_bluetooth_battery_start_margin"
android:layout_marginTop="@dimen/le_bluetooth_battery_top_margin"
android:orientation="horizontal"
android:visibility="gone"
android:focusable="true">
<TextView
android:id="@+id/bt_battery_left_title"
style="@style/TextAppearance.EntityHeaderTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/le_bluetooth_battery_top_margin"
android:layout_weight="1"
android:gravity="start|center_vertical"
android:ellipsize="end"
android:textDirection="locale"
android:text="@string/bluetooth_left_name"
android:textSize="@dimen/advanced_bluetooth_header_title_text_size"/>
<TextView
android:id="@+id/bt_battery_right_title"
android:id="@+id/bt_battery_left_summary"
style="@style/TextAppearance.EntityHeaderSummary"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/le_bluetooth_summary_start_margin"
android:minWidth="@dimen/le_bluetooth_summary_min_width"
android:padding="@dimen/le_bluetooth_summary_padding"
android:drawablePadding="@dimen/le_bluetooth_summary_drawable_padding"/>
</LinearLayout>
<LinearLayout
android:id="@+id/bt_battery_right"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/le_bluetooth_battery_start_margin"
android:layout_marginTop="@dimen/le_bluetooth_battery_top_margin"
android:orientation="horizontal"
android:visibility="gone"
android:focusable="true">
<TextView
style="@style/TextAppearance.EntityHeaderTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/le_bluetooth_battery_top_margin"
android:layout_weight="1"
android:gravity="start|center_vertical"
android:ellipsize="end"
android:textDirection="locale"
android:text="@string/bluetooth_right_name"
android:textSize="@dimen/advanced_bluetooth_header_title_text_size"/>
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/le_bluetooth_summary_start_margin"
android:orientation="vertical">
<TextView
android:id="@+id/bt_battery_case_summary"
style="@style/TextAppearance.EntityHeaderSummary"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/le_bluetooth_battery_top_margin"
android:padding="@dimen/le_bluetooth_summary_padding"
android:drawablePadding="@dimen/le_bluetooth_summary_drawable_padding"
android:visibility="gone"/>
<TextView
android:id="@+id/bt_battery_left_summary"
style="@style/TextAppearance.EntityHeaderSummary"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/le_bluetooth_battery_top_margin"
android:padding="@dimen/le_bluetooth_summary_padding"
android:drawablePadding="@dimen/le_bluetooth_summary_drawable_padding"/>
<TextView
android:id="@+id/bt_battery_right_summary"
style="@style/TextAppearance.EntityHeaderSummary"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/le_bluetooth_battery_top_margin"
android:layout_marginStart="@dimen/le_bluetooth_summary_start_margin"
android:minWidth="@dimen/le_bluetooth_summary_min_width"
android:padding="@dimen/le_bluetooth_summary_padding"
android:drawablePadding="@dimen/le_bluetooth_summary_drawable_padding"/>
</LinearLayout>

1
res/values/dimens.xml
View File

@@ -415,6 +415,7 @@
<dimen name="le_bluetooth_summary_drawable_padding">6dp</dimen>
<dimen name="le_bluetooth_summary_start_margin">20dp</dimen>
<dimen name="le_bluetooth_summary_padding">1.5dp</dimen>
<dimen name="le_bluetooth_summary_min_width">64dp</dimen>
<!-- Header layout of bluetooth find broadcast page -->
<dimen name="bluetooth_find_broadcast_button_one_size">220dp</dimen>