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

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

Merge changes from topic "q_dark_theme" 

* changes:
  Migrate SysUI theme to UiMode
  Revert "Add theme mode design let user can choose theme self"
  Revert "Activate dark theme when the UiMode is UI_MODE_NIGHT_YES."
parents 46335fca 40ec6b78

core/java/android/provider/Settings.java

+0 −29
Original line number Diff line number Diff line
@@ -7125,35 +7125,6 @@ public final class Settings { 
         */

        public static final String UI_NIGHT_MODE = "ui_night_mode";









        /**









         * The current device UI theme mode effect SystemUI and Launcher.<br/>









         * <b>Values:</b><br/>









         * 0 - The mode that theme will controlled by wallpaper color.<br/>









         * 1 - The mode that will always light theme.<br/>









         * 2 - The mode that will always dark theme.<br/>









         *









         * @hide









         */









        public static final String THEME_MODE = "theme_mode";

















        /**









         * THEME_MODE value for wallpaper mode.









         * @hide









         */









        public static final int THEME_MODE_WALLPAPER = 0;

















        /**









         * THEME_MODE value for light theme mode.









         * @hide









         */









        public static final int THEME_MODE_LIGHT = 1;

















        /**









         * THEME_MODE value for dark theme mode.









         * @hide









         */









        public static final int THEME_MODE_DARK = 2;

















        /**









         * Whether screensavers are enabled.









         * @hide
































core/res/res/values-night/values.xml
0 → 100644



+34
−0






























Original line number
Diff line number
Diff line









<?xml version="1.0" encoding="utf-8"?>









<!--









  ~ Copyright (C) 2018 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









  -->



















<resources>









    <style name="Theme.DeviceDefault.QuickSettings" parent="android:Theme.DeviceDefault">









        <!-- Color palette -->









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









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









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









        <item name="colorError">@color/error_color_device_default_dark</item>









        <item name="colorControlNormal">?attr/textColorPrimary</item>









        <item name="alertDialogTheme">@style/Theme.DeviceDefault.Dialog.Alert</item>



















        <!-- QS panel background -->









        <item name="colorBackgroundFloating">@color/material_grey_900</item>



















        <!-- volume background -->









        <item name="panelColorBackground">@color/material_grey_800</item>









    </style>









</resources>








 No newline at end of file
























core/tests/coretests/src/android/provider/SettingsBackupTest.java



+0
−1






























Original line number
Diff line number
Diff line







@@ -605,7 +605,6 @@ public class SettingsBackupTest {







                 Settings.Secure.SLEEP_TIMEOUT,









                 Settings.Secure.SMS_DEFAULT_APPLICATION,









                 Settings.Secure.SPELL_CHECKER_ENABLED,  // Intentionally removed in Q









                 Settings.Secure.THEME_MODE,









                 Settings.Secure.TRUST_AGENTS_INITIALIZED,









                 Settings.Secure.TV_INPUT_CUSTOM_LABELS,









                 Settings.Secure.TV_INPUT_HIDDEN_INPUTS,




































packages/SystemUI/res/values/styles.xml



+2
−5






























Original line number
Diff line number
Diff line







@@ -335,10 +335,7 @@







        <item name="*android:errorColor">?android:attr/colorError</item>









    </style>



















    <!-- Overlay manager may replace this theme -->









    <style name="qs_base" parent="@*android:style/Theme.DeviceDefault.QuickSettings" />



















    <style name="qs_theme" parent="qs_base">









    <style name="qs_theme" parent="@*android:style/Theme.DeviceDefault.QuickSettings">









        <item name="lightIconTheme">@style/QSIconTheme</item>









        <item name="darkIconTheme">@style/QSIconTheme</item>









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








@@ -501,7 +498,7 @@







           parent="@*android:style/TextAppearance.Material.Notification.Info">









    </style>



















    <style name="edit_theme" parent="qs_base">









    <style name="edit_theme" parent="qs_theme">









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









    </style>