From 909068130393c73b36420b71a9c0441b0fcff7d0 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Thu, 26 Aug 2021 08:40:33 +0200
Subject: [PATCH] Use Android 12 splash screen

---
 .../main/java/eu/faircode/email/ActivityMain.java  |  7 +++++--
 app/src/main/res/values/styles.xml                 | 14 ++++++++++++++
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/ActivityMain.java b/app/src/main/java/eu/faircode/email/ActivityMain.java
index 2df5b1ad0f..461eb21132 100644
--- a/app/src/main/java/eu/faircode/email/ActivityMain.java
+++ b/app/src/main/java/eu/faircode/email/ActivityMain.java
@@ -25,6 +25,7 @@ import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.res.Configuration;
 import android.net.Uri;
+import android.os.Build;
 import android.os.Bundle;
 
 import androidx.fragment.app.FragmentManager;
@@ -135,12 +136,14 @@ public class ActivityMain extends ActivityBase implements FragmentManager.OnBack
             final SimpleTask<Boolean> boot = new SimpleTask<Boolean>() {
                 @Override
                 protected void onPreExecute(Bundle args) {
-                    getMainHandler().postDelayed(splash, SPLASH_DELAY);
+                    if (Build.VERSION.SDK_INT < Build.VERSION_CODES.S)
+                        getMainHandler().postDelayed(splash, SPLASH_DELAY);
                 }
 
                 @Override
                 protected void onPostExecute(Bundle args) {
-                    getMainHandler().removeCallbacks(splash);
+                    if (Build.VERSION.SDK_INT < Build.VERSION_CODES.S)
+                        getMainHandler().removeCallbacks(splash);
                     getWindow().setBackgroundDrawable(null);
                 }
 
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 452f649659..304f1e70cf 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -27,6 +27,13 @@
     <style name="AppThemeBaseLight" parent="Base.Theme.AppCompat.Light.DarkActionBar">
         <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
+        </item>
+        <item name="android:windowSplashScreenAnimatedIcon" tools:targetApi="s">
+            @mipmap/ic_launcher_round
+        </item>
+
         <item name="android:windowDisablePreview">true</item>
         <item name="android:windowAnimationStyle">@style/activityAnimationStyle</item>
 
@@ -72,6 +79,13 @@
     <style name="AppThemeBaseDark" parent="Base.Theme.AppCompat">
         <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
+        </item>
+        <item name="android:windowSplashScreenAnimatedIcon" tools:targetApi="s">
+            @mipmap/ic_launcher_round
+        </item>
+
         <item name="android:windowDisablePreview">true</item>
         <item name="android:windowAnimationStyle">@style/activityAnimationStyle</item>