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

Commit a35bc15c authored by Nishith Khanna's avatar Nishith Khanna
Browse files

Theme quick settings and power menu according to our palette

parent d305df02

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

+3 −0
Original line number Diff line number Diff line
@@ -26,6 +26,9 @@ 
        <item name="colorControlNormal">?attr/textColorPrimary</item>

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

        <item name="forceDarkAllowed">false</item>

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

        <item name="colorSurface">#2F3034</item>

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

    </style>



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

core/res/res/values/themes_device_defaults.xml

+10 −9
Original line number Diff line number Diff line
@@ -4164,16 +4164,16 @@ easier. 
        <item name="colorPrimaryDark">@color/primary_dark_device_default_settings_light</item>

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

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

        <item name="colorAccentPrimary">@color/accent_primary_device_default</item>

        <item name="colorAccentSecondary">@color/accent_secondary_device_default</item>

        <item name="colorAccentTertiary">@color/accent_tertiary_device_default</item>

        <item name="colorAccentPrimaryVariant">@color/accent_primary_variant_light_device_default</item>

        <item name="colorAccentPrimary">@color/accent_device_default</item>

        <item name="colorAccentSecondary">@color/accent_device_default</item>

        <item name="colorAccentTertiary">@color/accent_device_default</item>

        <item name="colorAccentPrimaryVariant">@color/accent_device_default</item>

        <item name="colorAccentSecondaryVariant">@color/accent_secondary_variant_light_device_default</item>

        <item name="colorAccentTertiaryVariant">@color/accent_tertiary_variant_light_device_default</item>

        <item name="colorSurface">@color/surface_light</item>

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

        <item name="colorSurfaceHighlight">@color/surface_highlight_light</item>

        <item name="colorSurfaceVariant">@color/surface_variant_light</item>

        <item name="colorSurfaceHeader">@color/surface_header_light</item>

        <item name="colorSurfaceHeader">#F1F0F3</item>

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

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

        <item name="alertDialogTheme">@style/Theme.DeviceDefault.Light.Dialog.Alert</item>
@@ -4191,6 +4191,7 @@ easier. 


        <!-- Toolbar attributes -->

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

        <item name="android:colorBackgroundFloating">#F1F0F3</item>



        <item name="materialColorOnSecondaryFixedVariant">@color/system_on_secondary_fixed_variant</item>

        <item name="materialColorOnTertiaryFixedVariant">@color/system_on_tertiary_fixed_variant</item>
@@ -4222,11 +4223,11 @@ easier. 


        <item name="materialColorOnSecondary">@color/system_on_secondary_light</item>

        <item name="materialColorOnTertiary">@color/system_on_tertiary_light</item>

        <item name="materialColorSurfaceDim">@color/system_surface_dim_light</item>

        <item name="materialColorSurfaceDim">#F1F0F3</item>

        <item name="materialColorSurfaceBright">@color/system_surface_bright_light</item>

        <item name="materialColorOnError">@color/system_on_error_light</item>

        <item name="materialColorSurface">@color/system_surface_light</item>

        <item name="materialColorSurfaceContainerHigh">@color/system_surface_container_high_light</item>

        <item name="materialColorSurfaceContainerHigh">#FFFFFF</item>

        <item name="materialColorSurfaceContainerHighest">@color/system_surface_container_highest_light</item>

        <item name="materialColorOnSurfaceVariant">@color/system_on_surface_variant_light</item>

        <item name="materialColorOutline">@color/system_outline_light</item>
@@ -4234,7 +4235,7 @@ easier. 
        <item name="materialColorOnPrimary">@color/system_on_primary_light</item>

        <item name="materialColorOnSurface">@color/system_on_surface_light</item>

        <item name="materialColorSurfaceContainer">@color/system_surface_container_light</item>

        <item name="materialColorPrimary">@color/system_primary_light</item>

        <item name="materialColorPrimary">@color/e_accent</item>

        <item name="materialColorSecondary">@color/system_secondary_light</item>

        <item name="materialColorTertiary">@color/system_tertiary_light</item>

        <item name="materialColorError">@color/system_error_light</item>

packages/SystemUI/res/drawable/screenrecord_options_spinner_popup_background.xml

+1 −1
Original line number Diff line number Diff line
@@ -17,5 +17,5 @@ 
        xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"

        android:shape="rectangle">

    <corners android:radius="@dimen/screenrecord_spinner_background_radius"/>

    <solid android:color="?androidprv:attr/colorAccentSecondary" />

    <solid android:color="@*android:color/e_floating_background" />

</shape>
 
 No newline at end of file

packages/SystemUI/res/drawable/settingslib_thumb_selector.xml

+8 −21
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  Copyright (C) 2020 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:drawable="@drawable/settingslib_thumb_on" android:state_checked="true"/>

    <item android:drawable="@drawable/settingslib_thumb_off" android:state_checked="false"/>

    <item android:drawable="@drawable/settingslib_thumb_disabled" android:state_enabled="false"/>

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

    <item android:top="2dp" android:left="2dp" android:right="2dp" android:bottom="2dp">

        <shape android:shape="oval" >

            <size android:height="20dp" android:width="20dp" />

            <solid android:color="@*android:color/e_switch_thumb_color" />

        </shape>

    </item>

</layer-list>

packages/SystemUI/res/drawable/settingslib_track_selector.xml

+8 −21
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  Copyright (C) 2020 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:drawable="@drawable/settingslib_track_on_background" android:state_checked="true"/>

    <item android:drawable="@drawable/settingslib_track_off_background" android:state_checked="false"/>

    <item android:drawable="@drawable/settingslib_track_disabled_background" android:state_enabled="false"/>

</selector>
 
<shape

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

    android:shape="rectangle"

    android:width="36dp"

    android:height="20dp">

    <solid android:color="@*android:color/e_switch_track_color" />

    <corners android:radius="50dp" />

</shape>