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

Commit b47aa86e authored by Salvador Martinez's avatar Salvador Martinez
Browse files

Update framework Settings to follow dark theme UI 

New colors were decided on for dark theme so this change updates
relevant settings components to use those new colors.

Test: manual inspection
Bug: 111397440
Change-Id: I3c718991d761aa510af7dc9a396125394c6e6b82
parent 459e4069

core/res/res/values-night/themes_device_defaults.xml

+3 −0
Original line number Diff line number Diff line
@@ -52,6 +52,9 @@ easier. 
    <!-- DeviceDefault theme for a window that should look like the Settings app.  -->

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

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

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



        <item name="listDivider">@color/list_divider_color_dark</item>

    </style>



    <!-- Theme for the dialog shown when an app crashes or ANRs. -->

core/res/res/values/colors_device_defaults.xml

+3 −0
Original line number Diff line number Diff line
@@ -42,4 +42,7 @@ 
    <!-- Error color -->

    <color name="error_color_device_default_dark">@color/error_color_material_dark</color>

    <color name="error_color_device_default_light">@color/error_color_material_light</color>



    <color name="list_divider_color_light">#64000000</color>

    <color name="list_divider_color_dark">#85ffffff</color>

</resources>

core/res/res/values/themes_device_defaults.xml

+2 −0
Original line number Diff line number Diff line
@@ -1475,6 +1475,8 @@ easier. 


        <!-- Toolbar attributes -->

        <item name="toolbarStyle">@style/Widget.DeviceDefault.Toolbar</item>



        <item name="listDivider">@color/list_divider_color_light</item>

    </style>



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

packages/SettingsLib/res/drawable/list_divider_dark.xml

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

<!--

  Copyright (C) 2017 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.

  -->



<shape

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

    <solid android:color="#64000000" />

    <size

        android:height="1dp"

        android:width="1dp" />

</shape>

packages/SettingsLib/res/layout/preference_two_target_divider.xml

+1 −1
Original line number Diff line number Diff line
@@ -27,5 +27,5 @@ 
    <View

        android:layout_width="1dp"

        android:layout_height="match_parent"

        android:background="@drawable/list_divider_dark" />

        android:background="?android:attr/listDivider" />

</LinearLayout>
 
 No newline at end of file