mirror of https://github.com/M66B/FairEmail.git
Merge branch 'master' into dev
This commit is contained in:
commit
ee7a3622c8
|
@ -2,6 +2,8 @@
|
|||
<resources xmlns:tools="http://schemas.android.com/tools">
|
||||
<!-- https://material.io/resources/color/ -->
|
||||
|
||||
<color name="splashBackground">#7f7f7f</color>
|
||||
|
||||
<color name="colorDebug">#bc3f3f</color>
|
||||
|
||||
<color name="colorReadLight">#b3000000</color>
|
||||
|
|
|
@ -30,7 +30,7 @@
|
|||
<item name="themeName">light</item>
|
||||
<item name="android:forceDarkAllowed" tools:targetApi="q">false</item>
|
||||
<item name="android:windowSplashScreenBackground" tools:targetApi="s">
|
||||
@android:color/darker_gray
|
||||
@color/splashBackground
|
||||
</item>
|
||||
<item name="android:windowSplashScreenAnimatedIcon" tools:targetApi="s">
|
||||
@mipmap/ic_launcher_round
|
||||
|
@ -104,7 +104,7 @@
|
|||
<item name="themeName">dark</item>
|
||||
<item name="android:forceDarkAllowed" tools:targetApi="q">false</item>
|
||||
<item name="android:windowSplashScreenBackground" tools:targetApi="s">
|
||||
@android:color/darker_gray
|
||||
@color/splashBackground
|
||||
</item>
|
||||
<item name="android:windowSplashScreenAnimatedIcon" tools:targetApi="s">
|
||||
@mipmap/ic_launcher_round
|
||||
|
@ -584,7 +584,7 @@
|
|||
</style>
|
||||
|
||||
<style name="Theme.AppCompat.TranslucentSplash" parent="Theme.AppCompat.NoActionBar">
|
||||
<item name="android:windowBackground">@android:color/darker_gray</item>
|
||||
<item name="android:windowBackground">@color/splashBackground</item>
|
||||
</style>
|
||||
|
||||
<style name="activityAnimationStyle" parent="@android:style/Animation.Activity">
|
||||
|
|
Loading…
Reference in New Issue