Merge "Fix device icon overflow issue" into main

This commit is contained in:
Haijie Hong
2025-01-05 22:16:49 -08:00
committed by Android (Google) Code Review
2 changed files with 13 additions and 2 deletions

View File

@@ -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"

View File

@@ -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>