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

Commit 132cc212 authored by Jason Chiu's avatar Jason Chiu Committed by Android (Google) Code Review
Browse files

Merge "Revise homepage colors" into sc-dev

parents 7e0fb687 263d1e2c

res/values-night/colors.xml

+3 −1
Original line number Diff line number Diff line
@@ -14,13 +14,15 @@ 
     limitations under the License.

-->



<resources>

<resources

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

    <color name="switchbar_switch_track_tint">#82000000</color>

    <color name="switchbar_switch_thumb_tint">@android:color/black</color>

    <color name="homepage_accessibility_background">#783BE5</color>

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

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

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

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

    <color name="notification_importance_selection_bg">@*android:color/material_grey_800</color>

    <color name="notification_importance_button_selected">#AECBFA</color> <!-- material blue 200 -->

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

res/values/colors.xml

+1 −1
Original line number Diff line number Diff line
@@ -150,7 +150,7 @@ 
    <!-- End of QR code scanner colors -->



    <!-- Search bar background color -->

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

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



    <color name="face_intro_outline">#ffdadce0</color>

res/values/styles.xml

+4 −3
Original line number Diff line number Diff line
@@ -308,10 +308,11 @@ 
        <item name="android:textColor">?android:attr/textColorPrimary</item>

    </style>



    <style name="TextAppearance.SearchBar"

           parent="@*android:style/TextAppearance.DeviceDefault.Widget.Toolbar.Subtitle">

    <style name="TextAppearance.SearchBar">

        <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/textColorTertiary</item>

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

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

    </style>

src/com/android/settings/Utils.java

+1 −1
Original line number Diff line number Diff line
@@ -1219,7 +1219,7 @@ 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, android.R.attr.textColorSecondary);

    }



    public static boolean isProviderModelEnabled(Context context) {