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

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

Merge "[Expressive design] Update StatusBanner layout and color" into main

parents fd1ac0a8 db4ef3f1

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

+1 −2
Original line number Original line Diff line number Diff line
@@ -102,10 +102,9 @@ 
    <style name="SettingsLibStatusBannerCardStyle">

    <style name="SettingsLibStatusBannerCardStyle">

        <item name="android:layout_width">match_parent</item>

        <item name="android:layout_width">match_parent</item>

        <item name="android:layout_height">wrap_content</item>

        <item name="android:layout_height">wrap_content</item>

        <item name="android:layout_marginHorizontal">?android:attr/listPreferredItemPaddingStart</item>

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

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

        <item name="cardBackgroundColor">@color/settingslib_materialColorSurfaceBright</item>

        <item name="cardBackgroundColor">@color/settingslib_materialColorSurfaceBright</item>

        <item name="cardCornerRadius">@dimen/settingslib_expressive_radius_extralarge2</item>

        <item name="cardCornerRadius">@dimen/settingslib_expressive_radius_extralarge1</item>

        <item name="cardElevation">0dp</item>

        <item name="cardElevation">0dp</item>

        <item name="rippleColor">?android:attr/colorControlHighlight</item>

        <item name="rippleColor">?android:attr/colorControlHighlight</item>

    </style>

    </style>

packages/SettingsLib/StatusBannerPreference/res/drawable-night/settingslib_expressive_background_level_high.xml

+2 −2
Original line number Original line Diff line number Diff line
@@ -16,6 +16,6 @@ 
  -->

  -->

<shape xmlns:android="http://schemas.android.com/apk/res/android"

<shape xmlns:android="http://schemas.android.com/apk/res/android"

    android:shape="oval">

    android:shape="oval">

    <size android:height="68dp" android:width="68dp" />

    <size android:height="72dp" android:width="72dp" />

    <solid android:color="@color/settingslib_materialColorSurfaceContainerHigh" />

    <solid android:color="@color/m3_ref_palette_red20" />

</shape>
 
</shape>

packages/SettingsLib/StatusBannerPreference/res/drawable-night/settingslib_expressive_background_level_low.xml

+2 −2
Original line number Original line Diff line number Diff line
@@ -16,6 +16,6 @@ 
  -->

  -->

<shape xmlns:android="http://schemas.android.com/apk/res/android"

<shape xmlns:android="http://schemas.android.com/apk/res/android"

    android:shape="oval">

    android:shape="oval">

    <size android:height="68dp" android:width="68dp" />

    <size android:height="72dp" android:width="72dp" />

    <solid android:color="@color/settingslib_materialColorSurfaceContainerHigh" />

    <solid android:color="@color/m3_ref_palette_green20" />

</shape>
 
</shape>

packages/SettingsLib/StatusBannerPreference/res/drawable-night/settingslib_expressive_background_level_medium.xml

+2 −2
Original line number Original line Diff line number Diff line
@@ -16,6 +16,6 @@ 
  -->

  -->

<shape xmlns:android="http://schemas.android.com/apk/res/android"

<shape xmlns:android="http://schemas.android.com/apk/res/android"

    android:shape="oval">

    android:shape="oval">

    <size android:height="68dp" android:width="68dp" />

    <size android:height="72dp" android:width="72dp" />

    <solid android:color="@color/settingslib_materialColorSurfaceContainerHigh" />

    <solid android:color="@color/m3_ref_palette_yellow20" />

</shape>
 
</shape>

packages/SettingsLib/StatusBannerPreference/res/drawable/settingslib_expressive_background_generic.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -16,6 +16,6 @@ 
  -->

  -->

<shape xmlns:android="http://schemas.android.com/apk/res/android"

<shape xmlns:android="http://schemas.android.com/apk/res/android"

    android:shape="oval">

    android:shape="oval">

    <size android:height="68dp" android:width="68dp" />

    <size android:height="72dp" android:width="72dp" />

    <solid android:color="@color/settingslib_materialColorSurfaceContainerHigh" />

    <solid android:color="@color/settingslib_materialColorSurfaceContainerHigh" />

</shape>
 
</shape>
 
 No newline at end of file