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

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

Merge "Change default settings theme to light color."

parents 61238c2d 59d488a1

core/res/res/values/colors_device_defaults.xml

+3 −0
Original line number Diff line number Diff line
@@ -20,11 +20,14 @@ 
    <color name="primary_device_default_dark">@color/primary_material_dark</color>

    <color name="primary_device_default_light">@color/primary_material_light</color>

    <color name="primary_device_default_settings">@color/primary_material_settings</color>

    <color name="primary_device_default_settings_light">@color/primary_material_settings_light</color>

    <color name="primary_dark_device_default_dark">@color/primary_dark_material_dark</color>

    <color name="primary_dark_device_default_light">@color/primary_dark_material_light</color>

    <color name="primary_dark_device_default_settings">@color/primary_dark_material_settings</color>

    <color name="primary_dark_device_default_settings_light">@color/primary_dark_material_settings_light</color>



    <color name="secondary_device_default_settings">@color/secondary_material_settings</color>

    <color name="secondary_device_default_settings_light">@color/secondary_material_settings_light</color>

    <color name="tertiary_device_default_settings">@color/tertiary_material_settings</color>

    <color name="quaternary_device_default_settings">@color/quaternary_material_settings</color>

core/res/res/values/colors_material.xml

+4 −0
Original line number Diff line number Diff line
@@ -27,12 +27,15 @@ 
    <color name="primary_material_dark">@color/material_grey_900</color>

    <color name="primary_material_light">@color/material_grey_100</color>

    <color name="primary_material_settings">@color/material_blue_grey_900</color>

    <color name="primary_material_settings_light">@color/material_grey_100</color>

    <color name="primary_dark_material_dark">@color/black</color>

    <color name="primary_dark_material_light">@color/material_grey_600</color>

    <color name="primary_dark_material_light_light_status_bar">@color/material_grey_300</color>

    <color name="primary_dark_material_settings">@color/material_blue_grey_950</color>

    <color name="primary_dark_material_settings_light">@color/material_grey_300</color>



    <color name="secondary_material_settings">@color/material_blue_grey_800</color>

    <color name="secondary_material_settings_light">@color/material_grey_200</color>

    <color name="tertiary_material_settings">@color/material_blue_grey_700</color>

    <color name="quaternary_material_settings">@color/material_blue_grey_200</color>
@@ -88,6 +91,7 @@ 
    <color name="material_grey_800">#ff424242</color>

    <color name="material_grey_600">#ff757575</color>

    <color name="material_grey_300">#ffe0e0e0</color>

    <color name="material_grey_200">#ffeeeeee</color>

    <color name="material_grey_100">#fff5f5f5</color>

    <color name="material_grey_50">#fffafafa</color>

core/res/res/values/themes_device_defaults.xml

+3 −17
Original line number Diff line number Diff line
@@ -736,20 +736,12 @@ easier. 
    <!-- DeviceDefault theme for a window that should look like the Settings app.  -->

    <style name="Theme.DeviceDefault.Settings" parent="Theme.Material.Settings">

        <!-- Color palette -->

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

        <item name="colorPrimaryDark">@color/primary_dark_device_default_settings</item>

        <item name="colorSecondary">@color/secondary_device_default_settings</item>

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

        <item name="colorPrimaryDark">@color/primary_dark_device_default_settings_light</item>

        <item name="colorSecondary">@color/secondary_device_default_settings_light</item>

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

    </style>



    <!-- @hide DeviceDefault theme that should look like the Settings app. The action bar will use a

         light background and accent color for text and icon. -->

    <style name="Theme.DeviceDefault.Settings.LightActionBar">

        <!-- ActionBar -->

        <item name="actionBarTheme">@style/ThemeOverlay.DeviceDefault.ActionBar.Accent</item>

        <item name="actionBarStyle">@style/Widget.DeviceDefault.Light.ActionBar</item>

    </style>



    <!-- @hide DeviceDefault theme for a window that should use Settings theme colors

         but has a full dark palette. ONLY USED FOR QUICK SETTINGS THEME -->

    <style name="Theme.DeviceDefault.QuickSettings" parent="Theme.Material">
@@ -817,12 +809,6 @@ easier. 


    <style name="ThemeOverlay.DeviceDefault" />



    <!-- @hide Theme overlay that inherits from material actionbar,  and use accent color for

             primary text -->

    <style name="ThemeOverlay.DeviceDefault.ActionBar.Accent" parent="ThemeOverlay.Material.ActionBar">

        <item name="textColorPrimary">@color/btn_colored_borderless_text_material</item>

    </style>



    <style name="ThemeOverlay.DeviceDefault.Accent">

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

    </style>

core/res/res/values/themes_material.xml

+4 −4
Original line number Diff line number Diff line
@@ -1323,10 +1323,10 @@ please see themes_device_defaults.xml. 
    </style>



    <!-- Default theme for Settings and activities launched from Settings. -->

    <style name="Theme.Material.Settings" parent="Theme.Material.Light.DarkActionBar">

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

        <item name="colorPrimaryDark">@color/primary_dark_material_settings</item>

        <item name="colorSecondary">@color/secondary_material_settings</item>

    <style name="Theme.Material.Settings" parent="Theme.Material.Light.LightStatusBar">

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

        <item name="colorPrimaryDark">@color/primary_dark_material_settings_light</item>

        <item name="colorSecondary">@color/secondary_material_settings_light</item>



        <item name="presentationTheme">@style/Theme.Material.Settings.Dialog.Presentation</item>

        <item name="searchDialogTheme">@style/Theme.Material.Settings.SearchBar</item>

packages/SettingsLib/res/layout/settings_with_drawer.xml

+1 −1
Original line number Diff line number Diff line
@@ -26,12 +26,12 @@ 
        android:orientation="vertical"

        android:fitsSystemWindows="true">

        <FrameLayout

            style="?android:attr/actionBarStyle"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:theme="?android:attr/actionBarTheme">

            <Toolbar

                android:id="@+id/action_bar"

                style="?android:attr/actionBarStyle"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:navigationContentDescription="@*android:string/action_bar_up_description"/>