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

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

Merge "[Expressive design] make common resource can use on different SDK" into main

parents bd7cd391 e6fa0238

packages/SettingsLib/ActionButtonsPreference/res/values-v35/styles_expressive.xml

+3 −2
Original line number Diff line number Diff line
@@ -22,12 +22,13 @@ 
        <item name="iconGravity">textTop</item>

    </style>



    <style name="SettingsLibActionButton.Expressive.Label" parent="SettingsLibTextAppearance.Emphasized.Title.Small">

    <style name="SettingsLibActionButton.Expressive.Label" parent="">

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

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

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

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

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

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

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

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

    </style>

packages/SettingsLib/CardPreference/res/layout/settingslib_expressive_preference_card.xml

+0 −5
Original line number Diff line number Diff line
@@ -40,7 +40,6 @@ 


            <ImageView

                android:id="@android:id/icon"

                android:src="@drawable/settingslib_arrow_drop_down"

                android:layout_width="@dimen/settingslib_expressive_space_medium3"

                android:layout_height="@dimen/settingslib_expressive_space_medium3"

                android:scaleType="centerInside"/>
@@ -60,16 +59,12 @@ 
                android:id="@android:id/title"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:hyphenationFrequency="normalFast"

                android:lineBreakWordStyle="phrase"

                android:textAppearance="@style/TextAppearance.CardTitle.SettingsLib"/>



            <TextView

                android:id="@android:id/summary"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:hyphenationFrequency="normalFast"

                android:lineBreakWordStyle="phrase"

                android:textAppearance="@style/TextAppearance.CardSummary.SettingsLib"/>



        </LinearLayout>

packages/SettingsLib/CardPreference/res/values/styles_expressive.xml

+2 −4
Original line number Diff line number Diff line
@@ -17,14 +17,12 @@ 


<resources>

    <style name="TextAppearance.CardTitle.SettingsLib"

        parent="@style/TextAppearance.PreferenceTitle.SettingsLib">

        parent="@style/TextAppearance.SettingsLib.TitleMedium.Emphasized">

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

        <item name="android:textSize">20sp</item>

    </style>



    <style name="TextAppearance.CardSummary.SettingsLib"

        parent="@style/TextAppearance.PreferenceSummary.SettingsLib">

        parent="@style/TextAppearance.SettingsLib.LabelMedium">

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

        <item name="android:textSize">14sp</item>

    </style>

</resources>
 
 No newline at end of file

packages/SettingsLib/CollapsingToolbarBaseActivity/res/values-night-v35/themes.xml

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
    <style name="Theme.CollapsingToolbar.Settings" parent="@style/Theme.MaterialComponents.DayNight">

        <item name="elevationOverlayEnabled">true</item>

        <item name="elevationOverlayColor">?attr/colorPrimary</item>

        <item name="colorPrimary">@color/settingslib_materialColorInverseOnSurface</item>

        <item name="colorPrimary">@color/settingslib_materialColorOnSurfaceInverse</item>

        <item name="colorAccent">@color/settingslib_materialColorPrimaryFixed</item>

    </style>

</resources>
 
 No newline at end of file

packages/SettingsLib/CollapsingToolbarBaseActivity/res/values-v35/styles_expressive.xml

+3 −3
Original line number Diff line number Diff line
@@ -33,12 +33,12 @@ 
        <item name="contentScrim">@color/settingslib_materialColorSurfaceContainer</item>

    </style>



    <style name="SettingsLibCollapsingToolbarTitle.Collapsed" parent="@android:style/TextAppearance.DeviceDefault.Headline">

    <style name="SettingsLibCollapsingToolbarTitle.Collapsed" parent="@style/TextAppearance.SettingsLib.TitleLarge.Emphasized">

        <!--set dp because we don't want size adjust when font size change-->

        <item name="android:textSize">20dp</item>

        <item name="android:textSize">22dp</item>

    </style>



    <style name="SettingsLibCollapsingToolbarTitle.Expanded" parent="CollapsingToolbarTitle.Collapsed">

    <style name="SettingsLibCollapsingToolbarTitle.Expanded" parent="@style/TextAppearance.SettingsLib.DisplaySmall.Emphasized">

        <item name="android:textSize">36dp</item>

    </style>

</resources>
 
 No newline at end of file