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

Commit 958e5873 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix GAR color constrast issue on dialog" into sc-dev

parents 24472968 732ff785

res/values-night/colors.xml

+0 −2
Original line number Diff line number Diff line
@@ -21,8 +21,6 @@ 
    <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>

    <!-- Dialog background color. -->

    <color name="dialog_background">@*android:color/material_grey_800</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-night/themes.xml

+3 −2
Original line number Diff line number Diff line
@@ -15,7 +15,8 @@ 
     limitations under the License.

-->



<resources>

<resources

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



    <style name="Theme.Settings.Home" parent="Theme.Settings.HomeBase">

        <item name="colorPrimary">@*android:color/primary_device_default_settings</item>
@@ -31,7 +32,7 @@ 


    <style name="Theme.AlertDialog.Base" parent="@style/Theme.AppCompat.DayNight.Dialog.Alert">

        <item name="colorAccent">@*android:color/accent_device_default_dark</item>

        <item name="android:colorBackground">@color/dialog_background</item>

        <item name="android:colorBackground">?androidprv:attr/colorSurface</item>

    </style>



    <!-- Material theme for the pages containing TabLayout and ViewPager -->

res/values/colors.xml

+0 −3
Original line number Diff line number Diff line
@@ -147,9 +147,6 @@ 
    <!-- Search bar background color -->

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



    <!-- Dialog background color -->

    <color name="dialog_background">@*android:color/background_device_default_light</color>



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



    <color name="back_gesture_indicator">#4182ef</color>

res/values/themes.xml

+3 −2
Original line number Diff line number Diff line
@@ -14,7 +14,8 @@ 
     limitations under the License.

-->



<resources>

<resources

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



    <style name="Transparent">

        <item name="alertDialogTheme">@style/Theme.AlertDialog</item>
@@ -129,7 +130,7 @@ 


    <style name="Theme.AlertDialog.Base" parent="@style/Theme.AppCompat.DayNight.Dialog.Alert">

        <item name="colorAccent">@*android:color/accent_device_default_light</item>

        <item name="android:colorBackground">@color/dialog_background</item>

        <item name="android:colorBackground">?androidprv:attr/colorSurface</item>

    </style>



    <style name="Theme.AlertDialog" parent="Theme.AlertDialog.Base">