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

Unverified Commit ae5eb0ce authored by cketti's avatar cketti Committed by GitHub
Browse files

Merge pull request #8565 from cketti/startup_theme_fix

Fix startup theme
parents c172cb0a 792b1aec
Loading
Loading
Loading
Loading
+1 −3
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<resources xmlns:android="http://schemas.android.com/apk/res/android">
    <style name="Theme.K9.Startup" parent="Theme2.K9.Dark">
        <item name="android:windowBackground">@android:color/black</item>
    </style>
    <style name="Theme.K9.Startup" parent="Theme2.Main.Startup" />

    <style name="Theme.K9.Light" parent="Theme2.K9.Light">
        <item name="actionModeCloseDrawable">@drawable/ic_close</item>
+1 −3
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<resources xmlns:android="http://schemas.android.com/apk/res/android">
    <style name="Theme.Thunderbird.Startup" parent="Theme2.Thunderbird.Dark">
        <item name="android:windowBackground">@android:color/black</item>
    </style>
    <style name="Theme.Thunderbird.Startup" parent="Theme2.Main.Startup" />

    <style name="Theme.Thunderbird.Light" parent="Theme2.Thunderbird.Light">
        <item name="actionModeCloseDrawable">@drawable/ic_close</item>
+6 −0
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<resources>

    <style name="Theme2.Main.DayNight" parent="Theme2.Main.Dark" />

</resources>
+11 −3
Original line number Diff line number Diff line
@@ -72,8 +72,16 @@

    <style name="Theme2.Main.DayNight" parent="Theme2.Main.Light" />

    <style name="Theme2.Main.Startup" parent="Theme2.Main.Dark">
        <item name="android:windowBackground">@android:color/black</item>
    </style>
    <!--
    Android uses the theme configured in the manifest for its initial startup animation. On Android versions that don't
    support switching the system theme we have to optimize for either the light or dark theme. We chose the dark theme
    because it's often used in low light conditions and a bright flash during startup is more annoying than using a dark
    startup animation when the app is configured to use the light theme.

    On modern Android versions we override Theme2.Main.Startup to use Theme2.Main.DayNight instead. That way the startup
    animation will match the app theme if the app follows the system theme (which is the default configuration).
    See <values-v28/themes.xml>.
    -->
    <style name="Theme2.Main.Startup" parent="Theme2.Main.Dark" />

</resources>