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

Commit 32d40651 authored by Lucas Dupin's avatar Lucas Dupin
Browse files

Rename SysUI base theme 

For historical reasons, the base theme was called QuickSettings.
I'm renaming it to SystemUI because QS won't respond to dark theme
changes anymore.

Test: make
Bug: 183953523
Change-Id: I685c1a4c3fb5ffded8e2f44f13a6ba68e9c45686
parent 589e3ca0

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

+2 −2
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
  -->



<resources>

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

    <style name="Theme.DeviceDefault.SystemUI" 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>
@@ -27,5 +27,5 @@ 
        <item name="forceDarkAllowed">false</item>

    </style>



    <style name="Theme.DeviceDefault.QuickSettings.Dialog" parent="Theme.DeviceDefault.Dialog" />

    <style name="Theme.DeviceDefault.SystemUI.Dialog" parent="Theme.DeviceDefault.Dialog" />

</resources>
 
 No newline at end of file

core/res/res/values/symbols.xml

+1 −1
Original line number Diff line number Diff line
@@ -3569,7 +3569,7 @@ 


  <java-symbol type="bool" name="config_quickSettingsSupported" />



  <java-symbol type="style" name="Theme.DeviceDefault.QuickSettings" />

  <java-symbol type="style" name="Theme.DeviceDefault.SystemUI" />



  <java-symbol type="integer" name="default_data_warning_level_mb" />

  <java-symbol type="bool" name="config_useVideoPauseWorkaround" />

core/res/res/values/themes_device_defaults.xml

+2 −4
Original line number Diff line number Diff line
@@ -1884,9 +1884,7 @@ easier. 
        <item name="opacityListDivider">@color/list_divider_opacity_device_default_light</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.DeviceDefault.Light">

    <style name="Theme.DeviceDefault.SystemUI" parent="Theme.DeviceDefault.Light">

        <!-- Color palette -->

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

        <item name="colorPrimaryDark">@color/primary_dark_device_default_settings_light</item>
@@ -1914,7 +1912,7 @@ easier. 
        <item name="toolbarStyle">@style/Widget.DeviceDefault.Toolbar</item>

    </style>



    <style name="Theme.DeviceDefault.QuickSettings.Dialog" parent="Theme.DeviceDefault.Light.Dialog">

    <style name="Theme.DeviceDefault.SystemUI.Dialog" parent="Theme.DeviceDefault.Light.Dialog">

        <!-- Color palette -->

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

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

packages/SystemUI/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -679,7 +679,7 @@ 
        <activity

            android:name=".settings.brightness.BrightnessDialog"

            android:label="@string/quick_settings_brightness_dialog_title"

            android:theme="@*android:style/Theme.DeviceDefault.QuickSettings.Dialog"

            android:theme="@*android:style/Theme.DeviceDefault.SystemUI.Dialog"

            android:finishOnCloseSystemDialogs="true"

            android:launchMode="singleInstance"

            android:excludeFromRecents="true"

packages/SystemUI/res/values/styles.xml

+2 −2
Original line number Diff line number Diff line
@@ -316,7 +316,7 @@ 
    <style name="Animation.StatusBar">

    </style>



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

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

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

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

        <item name="wallpaperTextColor">@*android:color/primary_text_material_dark</item>
@@ -375,7 +375,7 @@ 
        <item name="*android:dotColor">?android:attr/textColorSecondary</item>

    </style>



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

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

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

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

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