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

Commit 90c634b0 authored by Lucas Dupin's avatar Lucas Dupin Committed by Android (Google) Code Review
Browse files

Merge changes from topic "rename_qs_theme" into sc-dev

* changes:
  Rename qs_theme
  Rename SysUI base theme
parents 9b9cf02d f1dd230d
Loading
Loading
Loading
Loading
+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
+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" />
+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>
+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"
+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@
    android:layout_height="match_parent"
    android:orientation="horizontal"
    android:clipToPadding="false"
    android:theme="@style/qs_theme"
    android:theme="@style/Theme.SystemUI.QuickSettings"
    android:gravity="center_horizontal | top"
    android:clipChildren="false"
>
Loading