From 7928455af6179eabe86000464f27a4b316313057 Mon Sep 17 00:00:00 2001
From: Haijie Hong <hahong@google.com>
Date: Sat, 4 Jan 2025 21:47:22 +0800
Subject: [PATCH] Fix device icon overflow issue

Flag: EXEMPT minor fix
Bug: 373988997
Test: local tested
Change-Id: I13185e3fc0b57dd6079eb0bef5d8fbda5efbddb9
---
 res/layout/advanced_bt_entity_sub.xml | 10 ++++++++--
 res/values/styles.xml                 |  5 +++++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/res/layout/advanced_bt_entity_sub.xml b/res/layout/advanced_bt_entity_sub.xml
index 77bc4f0987a..524e4e96549 100644
--- a/res/layout/advanced_bt_entity_sub.xml
+++ b/res/layout/advanced_bt_entity_sub.xml
@@ -30,14 +30,20 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal">
         <ImageView
+            android:layout_width="72dp"
+            android:layout_height="72dp"
+            android:layout_gravity="center"
+            android:background="@drawable/bt_header_circle_outline" />
+
+        <com.google.android.material.imageview.ShapeableImageView
             android:id="@+id/header_icon"
             android:layout_width="72dp"
             android:layout_height="72dp"
             android:layout_gravity="center"
             android:antialias="true"
-            android:background="@drawable/bt_header_circle_outline"
             android:padding="8dp"
-            android:scaleType="fitCenter" />
+            android:scaleType="fitCenter"
+            app:shapeAppearanceOverlay="@style/DeviceIconRoundedCornerStyle" />
 
         <com.google.android.material.progressindicator.CircularProgressIndicator
             android:id="@+id/battery_ring"
diff --git a/res/values/styles.xml b/res/values/styles.xml
index c656e138b13..2f4c1efc48d 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -1037,4 +1037,9 @@
         <item name="android:fontFamily">@*android:string/config_bodyFontFamily</item>
     </style>
 
+    <style name="DeviceIconRoundedCornerStyle">
+        <item name="cornerFamily">rounded</item>
+        <item name="cornerSize">12dp</item>
+    </style>
+
 </resources>