Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 12f53fad authored by Haijie Hong's avatar Haijie Hong Committed by Android (Google) Code Review
Browse files

Merge "Fix device icon overflow issue" into main

parents 3ebad898 7928455a

res/layout/advanced_bt_entity_sub.xml

+8 −2
Original line number Diff line number Diff line
@@ -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"

res/values/styles.xml

+5 −0
Original line number Diff line number Diff line
@@ -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>