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

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

Merge "[Settings] Migrate color roles to respect color contrast" into main

parents f000f82a dc087a63

res/color-night-v35/settings_two_pane_background_color.xml

0 → 100644
+18 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2024 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->

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

    <item android:color="@android:color/system_surface_dim_dark" />

</selector>
 
 No newline at end of file

res/color-v35/settings_two_pane_background_color.xml

0 → 100644
+18 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2024 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->

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

    <item android:color="@android:color/system_surface_dim_light" />

</selector>
 
 No newline at end of file

res/values-night/themes.xml

+3 −3
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
    <style name="Theme.Settings.Home" parent="Theme.Settings.HomeBase">

        <item name="colorPrimary">@*android:color/primary_device_default_settings</item>

        <item name="colorPrimaryDark">@*android:color/primary_dark_device_default_settings</item>

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

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

        <!-- Homepage should follow device default design, the values is same as device default theme.-->

        <item name="android:navigationBarColor">@android:color/black</item>

        <item name="android:statusBarColor">?attr/colorPrimaryDark</item>
@@ -29,9 +29,9 @@ 
    <style name="Theme.SubSettings" parent="Theme.SubSettings.Base"/>



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

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

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

        <item name="android:colorError">@color/settings_dialog_colorError</item>

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

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

    </style>



    <style name="Theme.Panel.Material" parent="Theme.Panel" >

res/values/themes.xml

+3 −2
Original line number Diff line number Diff line
@@ -115,9 +115,9 @@ 
    </style>



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

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

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

        <item name="android:colorError">@color/settings_dialog_colorError</item>

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

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

    </style>



    <style name="Theme.AlertDialog" parent="Theme.AlertDialog.Base">
@@ -204,6 +204,7 @@ 
        <!-- Homepage should follow device default design, the values is same as device default theme.-->

        <item name="android:navigationBarColor">@android:color/white</item>

        <item name="android:statusBarColor">?attr/colorPrimaryDark</item>

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

    </style>



    <style name="Theme.Settings.Home.NoAnimation">