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

Commit 15a39b3a authored by Lucas Dupin's avatar Lucas Dupin
Browse files

Revert "Replaced overlay target package" 

This reverts commit ae885416.
parent d78aa5d0

packages/SystemUI/res/values/styles.xml

+1 −5
Original line number Original line Diff line number Diff line
@@ -290,11 +290,7 @@ 
    <style name="Animation.StatusBar">

    <style name="Animation.StatusBar">

    </style>

    </style>





    <!-- Overlay styles will replace this theme -->

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

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

    </style>



    <style name="systemui_theme" parent="systemui_base">

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

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

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

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

        <item name="bgProtectTextColor">?android:attr/textColorPrimaryInverse</item>

        <item name="bgProtectTextColor">?android:attr/textColorPrimaryInverse</item>

packages/overlays/SysuiDarkThemeOverlay/AndroidManifest.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -2,7 +2,7 @@ 
    package="com.android.systemui.theme.dark"

    package="com.android.systemui.theme.dark"

    android:versionCode="1"

    android:versionCode="1"

    android:versionName="1.0">

    android:versionName="1.0">

    <overlay android:targetPackage="com.android.systemui" android:priority="1"/>

    <overlay android:targetPackage="android" android:priority="1"/>





    <application android:label="@string/sysui_overlay_dark" android:hasCode="false"/>

    <application android:label="@string/sysui_overlay_dark" android:hasCode="false"/>

</manifest>
 
</manifest>

packages/overlays/SysuiDarkThemeOverlay/res/values/styles.xml→packages/overlays/SysuiDarkThemeOverlay/res/values/themes_device_defaults.xml

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

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

<resources>

<resources>

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

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

        <item name="android:colorPrimary">@*android:color/primary_device_default_settings</item>

        <item name="android:colorPrimary">@*android:color/primary_device_default_settings</item>

        <item name="android:colorPrimaryDark">@*android:color/primary_dark_device_default_settings</item>

        <item name="android:colorPrimaryDark">@*android:color/primary_dark_device_default_settings</item>

        <!-- textColorPrimaryInverse is used on the lock screen and this means that we can't just

        <!-- textColorPrimaryInverse is used on the lock screen and this means that we can't just
@@ -13,7 +13,4 @@ 
        <item name="android:colorControlNormal">?android:attr/textColorPrimary</item>

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

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

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

    </style>

    </style>



    <style name="systemui_base" parent="DarkQuickSettings" />

    <style name="edit_theme" parent="DarkQuickSettings" />

</resources>
 
</resources>
 
 No newline at end of file

packages/overlays/SysuiLightWallpaperThemeOverlay/AndroidManifest.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -2,7 +2,7 @@ 
    package="com.android.systemui.theme.lightwallpaper"

    package="com.android.systemui.theme.lightwallpaper"

    android:versionCode="1"

    android:versionCode="1"

    android:versionName="1.0">

    android:versionName="1.0">

    <overlay android:targetPackage="com.android.systemui" android:priority="2"/>

    <overlay android:targetPackage="android" android:priority="2"/>





    <application android:label="@string/sysui_overlay_light" android:hasCode="false"/>

    <application android:label="@string/sysui_overlay_light" android:hasCode="false"/>

</manifest>
 
</manifest>

packages/overlays/SysuiLightWallpaperThemeOverlay/res/values/styles.xml→packages/overlays/SysuiLightWallpaperThemeOverlay/res/values/themes_device_defaults.xml

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

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

<resources>

<resources>

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

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

        <item name="android:textColorPrimaryInverse">@*android:color/primary_text_material_light</item>

        <item name="android:textColorPrimaryInverse">@*android:color/primary_text_material_light</item>

        <item name="android:textColorSecondaryInverse">@*android:color/secondary_text_material_light</item>

        <item name="android:textColorSecondaryInverse">@*android:color/secondary_text_material_light</item>

    </style>

    </style>