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

Commit be860b4d authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "[Expressive Design] apply Material 3 Expressive design button" into main

parents fa0e9852 549dc862

packages/SettingsLib/SettingsTheme/res/color/settingslib_expressive_button_outline_color_selector.xml

0 → 100644
+21 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  Copyright (C) 2024 The Android Open Source Project



  Licensed under the Apache License, Version 2.0 (the "License");

  you may not use this file except in compliance with the License.

  You may obtain a copy of the License at



       http://www.apache.org/licenses/LICENSE-2.0



  Unless required by applicable law or agreed to in writing, software

  distributed under the License is distributed on an "AS IS" BASIS,

  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  See the License for the specific language governing permissions and

  limitations under the License.

  -->



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

    <item android:state_checked="true" android:color="@android:color/transparent"/>

    <item android:color="?attr/colorOutlineVariant"/>

</selector>
 
 No newline at end of file

packages/SettingsLib/SettingsTheme/res/color/settingslib_expressive_button_outlined_background_color_selector.xml

0 → 100644
+25 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  Copyright (C) 2024 The Android Open Source Project



  Licensed under the Apache License, Version 2.0 (the "License");

  you may not use this file except in compliance with the License.

  You may obtain a copy of the License at



       http://www.apache.org/licenses/LICENSE-2.0



  Unless required by applicable law or agreed to in writing, software

  distributed under the License is distributed on an "AS IS" BASIS,

  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  See the License for the specific language governing permissions and

  limitations under the License.

  -->



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

    <item android:state_enabled="false" android:state_checked="true"

        android:alpha="0.12"

        android:color="?attr/colorOnSurface"/>

    <item android:state_checked="true" android:color="?attr/colorContainerChecked"/>

    <item android:state_checkable="true" android:color="?attr/colorContainerUnchecked"/>

    <item android:color="?attr/colorContainer" />

</selector>
 
 No newline at end of file

packages/SettingsLib/SettingsTheme/res/color/settingslib_expressive_filled_button_color.xml

0 → 100644
+24 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  Copyright (C) 2024 The Android Open Source Project



  Licensed under the Apache License, Version 2.0 (the "License");

  you may not use this file except in compliance with the License.

  You may obtain a copy of the License at



       http://www.apache.org/licenses/LICENSE-2.0



  Unless required by applicable law or agreed to in writing, software

  distributed under the License is distributed on an "AS IS" BASIS,

  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  See the License for the specific language governing permissions and

  limitations under the License.

  -->



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

    <item android:state_enabled="false"

        android:alpha="0.12" android:color="@color/settingslib_materialColorOnSurface"/>

    <item android:state_checked="true" android:color="@color/settingslib_materialColorPrimary"/>

    <item android:state_checkable="true" android:color="@color/settingslib_materialColorSurfaceContainer"/>

    <item android:color="@color/settingslib_materialColorPrimary" />

</selector>
 
 No newline at end of file

packages/SettingsLib/SettingsTheme/res/layout-v35/settingslib_expressive_collapsable_textview.xml

+1 −0
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ 
        android:id="@+id/collapse_button"

        app:layout_constraintTop_toBottomOf="@id/settingslib_expressive_learn_more"

        app:layout_constraintStart_toStartOf="parent"

        android:textColor="@color/settingslib_materialColorOnSurface"

        android:text="@string/settingslib_expressive_text_expand"

        app:icon="@drawable/settingslib_expressive_icon_expand"

        style="@style/SettingslibTextButtonStyle.Expressive"/>

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

+41 −46
Original line number Diff line number Diff line
@@ -17,27 +17,16 @@ 


<resources>

    <style name="SettingsLibButtonStyle.Expressive.Filled"

        parent="@style/Widget.Material3.Button">

        parent="@style/Widget.Material3Expressive.Button.Icon">

        <item name="android:theme">@style/Theme.Material3.DynamicColors.DayNight</item>

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

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

        <item name="android:gravity">center</item>

        <item name="android:minWidth">@dimen/settingslib_expressive_space_medium4</item>

        <item name="android:minHeight">@dimen/settingslib_expressive_space_medium4</item>

        <item name="android:paddingVertical">@dimen/settingslib_expressive_space_extrasmall5</item>

        <item name="android:paddingHorizontal">@dimen/settingslib_expressive_space_small1</item>

        <item name="android:backgroundTint">@color/settingslib_materialColorPrimary</item>

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

        <item name="android:textColor">@color/settingslib_materialColorOnPrimary</item>

        <item name="iconGravity">textStart</item>

        <item name="iconTint">@color/settingslib_materialColorOnPrimary</item>

        <item name="iconSize">@dimen/settingslib_expressive_space_small4</item>

    </style>



    <style name="SettingsLibButtonStyle.Expressive.Filled.Large">

        <item name="android:paddingVertical">@dimen/settingslib_expressive_space_small1</item>

        <item name="android:paddingHorizontal">@dimen/settingslib_expressive_space_small4</item>

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

        <item name="materialSizeOverlay">@style/SizeOverlay.Material3Expressive.Button.Medium</item>

    </style>



    <style name="SettingsLibButtonStyle.Expressive.Filled.Extra"
@@ -45,28 +34,34 @@ 
        <item name="android:layout_width">match_parent</item>

    </style>



    <style name="SettingsLibButtonStyle.Expressive.Icon.Filled"

        parent="@style/Widget.Material3Expressive.Button.IconButton.Filled">

        <item name="android:theme">@style/Theme.Material3.DynamicColors.DayNight</item>

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

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

        <item name="android:gravity">center</item>

    </style>



    <style name="SettingsLibButtonStyle.Expressive.Icon.Filled.Large">

        <item name="materialSizeOverlay">@style/SizeOverlay.Material3Expressive.Button.Medium</item>

    </style>



    <style name="SettingsLibButtonStyle.Expressive.Icon.Filled.Extra"

        parent="@style/SettingsLibButtonStyle.Expressive.Icon.Filled.Large">

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

    </style>



    <style name="SettingsLibButtonStyle.Expressive.Tonal"

        parent="@style/Widget.Material3.Button.TonalButton">

        parent="@style/Widget.Material3Expressive.Button.TonalButton.Icon">

        <item name="android:theme">@style/Theme.Material3.DynamicColors.DayNight</item>

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

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

        <item name="android:gravity">center</item>

        <item name="android:minWidth">@dimen/settingslib_expressive_space_medium4</item>

        <item name="android:minHeight">@dimen/settingslib_expressive_space_medium4</item>

        <item name="android:paddingVertical">@dimen/settingslib_expressive_space_extrasmall5</item>

        <item name="android:paddingHorizontal">@dimen/settingslib_expressive_space_small1</item>

        <item name="android:backgroundTint">@color/settingslib_materialColorSecondaryContainer</item>

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

        <item name="android:textColor">@color/settingslib_materialColorOnSecondaryContainer</item>

        <item name="iconGravity">textStart</item>

        <item name="iconTint">@color/settingslib_materialColorOnSecondaryContainer</item>

        <item name="iconSize">@dimen/settingslib_expressive_space_small4</item>

    </style>



    <style name="SettingsLibButtonStyle.Expressive.Tonal.Large">

        <item name="android:paddingVertical">@dimen/settingslib_expressive_space_small1</item>

        <item name="android:paddingHorizontal">@dimen/settingslib_expressive_space_small4</item>

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

        <item name="materialSizeOverlay">@style/SizeOverlay.Material3Expressive.Button.Medium</item>

    </style>



    <style name="SettingsLibButtonStyle.Expressive.Tonal.Extra"
@@ -74,29 +69,34 @@ 
        <item name="android:layout_width">match_parent</item>

    </style>



    <style name="SettingsLibButtonStyle.Expressive.Icon.Tonal"

        parent="@style/Widget.Material3Expressive.Button.IconButton.Tonal">

        <item name="android:theme">@style/Theme.Material3.DynamicColors.DayNight</item>

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

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

        <item name="android:gravity">center</item>

    </style>



    <style name="SettingsLibButtonStyle.Expressive.Icon.Tonal.Large">

        <item name="materialSizeOverlay">@style/SizeOverlay.Material3Expressive.Button.Medium</item>

    </style>



    <style name="SettingsLibButtonStyle.Expressive.Icon.Tonal.Extra"

        parent="@style/SettingsLibButtonStyle.Expressive.Tonal.Large">

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

    </style>



    <style name="SettingsLibButtonStyle.Expressive.Outline"

        parent="@style/Widget.Material3.Button.OutlinedButton.Icon">

        parent="@style/Widget.Material3Expressive.Button.OutlinedButton.Icon">

        <item name="android:theme">@style/Theme.Material3.DynamicColors.DayNight</item>

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

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

        <item name="android:gravity">center</item>

        <item name="android:minWidth">@dimen/settingslib_expressive_space_medium4</item>

        <item name="android:minHeight">@dimen/settingslib_expressive_space_medium4</item>

        <item name="android:paddingVertical">@dimen/settingslib_expressive_space_extrasmall5</item>

        <item name="android:paddingHorizontal">@dimen/settingslib_expressive_space_small1</item>

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

        <item name="android:textColor">@color/settingslib_materialColorPrimary</item>

        <item name="iconTint">@color/settingslib_materialColorPrimary</item>

        <item name="iconGravity">textStart</item>

        <item name="iconSize">@dimen/settingslib_expressive_space_small4</item>

        <item name="iconPadding">@dimen/settingslib_expressive_space_extrasmall4</item>

        <item name="strokeColor">@color/settingslib_materialColorOutlineVariant</item>

    </style>



    <style name="SettingsLibButtonStyle.Expressive.Outline.Large">

        <item name="android:paddingVertical">@dimen/settingslib_expressive_space_small1</item>

        <item name="android:paddingHorizontal">@dimen/settingslib_expressive_space_small4</item>

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

        <item name="materialSizeOverlay">@style/SizeOverlay.Material3Expressive.Button.Medium</item>

    </style>



    <style name="SettingsLibButtonStyle.Expressive.Outline.Extra"
@@ -105,15 +105,10 @@ 
    </style>



    <style name="SettingslibTextButtonStyle.Expressive"

        parent="@style/Widget.Material3.Button.TextButton.Icon">

        parent="@style/Widget.Material3Expressive.Button.TextButton.Icon">

        <item name="android:theme">@style/Theme.Material3.DynamicColors.DayNight</item>

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

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

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

        <item name="android:textColor">@color/settingslib_materialColorOnSurface</item>

        <item name="iconTint">@null</item>

        <item name="iconPadding">@dimen/settingslib_expressive_space_extrasmall4</item>

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

    </style>



    <style name="SettingsLibCardStyle" parent="">