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

Commit 3042a3f0 authored by Marcus Ge's avatar Marcus Ge Committed by Android (Google) Code Review
Browse files

Merge "Update Settings homepage color role mappings" into main

parents 3085f01f 775280aa

res/layout/homepage_preference.xml

+2 −1
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 


<LinearLayout

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

    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"

    xmlns:app="http://schemas.android.com/apk/res-auto"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"
@@ -77,7 +78,7 @@ 
            android:layout_gravity="start"

            android:textAlignment="viewStart"

            android:textAppearance="?android:attr/textAppearanceSmall"

            android:textColor="?android:attr/textColorSecondary"

            android:textColor="?androidprv:attr/materialColorOnSurfaceVariant"

            android:maxLines="4"

            android:hyphenationFrequency="normalFast"

            android:lineBreakWordStyle="phrase"

res/values-night/colors.xml

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
    <color name="homepage_accessibility_background">#783BE5</color>

    <color name="homepage_support_background">#3F5FBD</color>

    <color name="contextual_card_background">@*android:color/material_grey_900</color>

    <color name="search_bar_background">?androidprv:attr/materialColorSurfaceContainerHigh</color>

    <color name="search_bar_background">?androidprv:attr/materialColorSurfaceBright</color>

    <color name="notification_importance_button_unselected">#5F6368</color>



    <!-- Palette list preference colors. -->

res/values/styles.xml

+1 −1
Original line number Diff line number Diff line
@@ -249,7 +249,7 @@ 
        <item name="android:layout_gravity">center</item>

        <item name="android:fontFamily">@*android:string/config_headlineFontFamily</item>

        <item name="android:textSize">@dimen/search_bar_text_size</item>

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

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

        <item name="android:singleLine">true</item>

    </style>

src/com/android/settings/Utils.java

+2 −1
Original line number Diff line number Diff line
@@ -1289,7 +1289,8 @@ public final class Utils extends com.android.settingslib.Utils { 
     */

    @ColorInt

    public static int getHomepageIconColor(Context context) {

        return getColorAttrDefaultColor(context, android.R.attr.textColorPrimary);

        return getColorAttrDefaultColor(

                context, com.android.internal.R.attr.materialColorOnSurface);

    }



    /**