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

Commit e96acc16 authored by Edgar Wang's avatar Edgar Wang Committed by Android (Google) Code Review
Browse files

Merge "[Expressive design] Update layout for StatusBannerMessage" into main

parents 6a41c55f a9e96b8c

packages/SettingsLib/BannerMessagePreference/res/layout-v36/settingslib_expressive_banner_message.xml

+10 −9
Original line number Diff line number Diff line
@@ -50,11 +50,6 @@ 
                        android:layout_alignParentStart="true"

                        android:layout_marginEnd="@dimen/settingslib_expressive_space_medium4"

                        android:orientation="vertical">

                        <TextView

                            android:id="@+id/banner_header"

                            android:layout_width="match_parent"

                            android:layout_height="wrap_content"

                            style="@style/Banner.Header.SettingsLib.Expressive"/>



                        <LinearLayout

                            android:layout_width="wrap_content"
@@ -62,19 +57,25 @@ 


                            <ImageView

                                android:id="@+id/banner_icon"

                                android:layout_width="@dimen/settingslib_expressive_space_small3"

                                android:layout_height="@dimen/settingslib_expressive_space_small3"

                                android:layout_width="28dp"

                                android:layout_height="28dp"

                                android:layout_gravity="center_vertical"

                                android:layout_marginEnd="@dimen/settingslib_expressive_space_extrasmall4"

                                android:importantForAccessibility="no"

                                android:scaleType="fitCenter" />



                            <TextView

                                android:id="@+id/banner_header"

                                android:layout_width="match_parent"

                                android:layout_height="wrap_content"

                                style="@style/Banner.Header.SettingsLib.Expressive"/>

                        </LinearLayout>



                        <TextView

                            android:id="@+id/banner_title"

                            android:layout_width="match_parent"

                            android:layout_height="wrap_content"

                            style="@style/Banner.Title.SettingsLib.Expressive" />

                        </LinearLayout>



                        <TextView

                            android:id="@+id/banner_subtitle"

packages/SettingsLib/BannerMessagePreference/res/values-v36/styles_expressive.xml

+1 −2
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
    <style name="Banner.Header.SettingsLib.Expressive"

        parent="">

        <item name="android:textAlignment">viewStart</item>

        <item name="android:paddingBottom">@dimen/settingslib_expressive_space_extrasmall4</item>

        <item name="android:layout_gravity">center_vertical</item>

        <item name="android:textAppearance">@style/TextAppearance.SettingsLib.LabelMedium</item>

        <item name="android:textColor">?android:attr/textColorPrimary</item>

    </style>
@@ -42,7 +42,6 @@ 
        parent="">

        <item name="android:layout_gravity">start</item>

        <item name="android:textAlignment">viewStart</item>

        <item name="android:paddingTop">@dimen/settingslib_expressive_space_extrasmall4</item>

        <item name="android:textAppearance">@style/TextAppearance.SettingsLib.BodyMedium</item>

        <item name="android:textColor">?android:attr/textColorPrimary</item>

    </style>