Merge branch 'master' into dev

app/src/main/java/eu/faircode/email/ActivityMain.java

@@ -26,7 +26,6 @@ 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 android.provider.Settings;
 import android.view.LayoutInflater;
@@ -218,19 +217,16 @@ public class ActivityMain extends ActivityBase implements FragmentManager.OnBack
             final SimpleTask<Boolean> boot = new SimpleTask<Boolean>() {
                 @Override
                 protected void onPreExecute(Bundle args) {
-                    if (Build.VERSION.SDK_INT < Build.VERSION_CODES.S)
-                        getMainHandler().postDelayed(splash, SPLASH_DELAY);
+                    getMainHandler().postDelayed(splash, SPLASH_DELAY);
                 }
 
                 @Override
                 protected void onPostExecute(Bundle args) {
-                    if (Build.VERSION.SDK_INT < Build.VERSION_CODES.S)
-                        getMainHandler().removeCallbacks(splash);
-                    getWindow().setBackgroundDrawable(null);
+                    getMainHandler().removeCallbacks(splash);
                 }
 
                 @Override
-                protected Boolean onExecute(Context context, Bundle args) {
+                protected Boolean onExecute(Context context, Bundle args) throws InterruptedException {
                     DB db = DB.getInstance(context);
 
                     SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);

app/src/main/res/drawable/splash.xml

@@ -1,5 +1,12 @@
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@android:color/darker_gray" />
+    <item
+        android:width="200dp"
+        android:height="200dp">
+        <shape>
+            <solid android:color="@android:color/darker_gray" />
+            <corners android:radius="400px" />
+        </shape>
+    </item>
     <item>
         <bitmap
             android:gravity="center"

app/src/main/res/values/styles.xml

@@ -585,6 +585,7 @@
 
     <style name="Theme.AppCompat.TranslucentSplash" parent="Theme.AppCompat.NoActionBar">
         <item name="android:windowBackground">@color/splashBackground</item>
+        <item name="android:windowDisablePreview">true</item>
     </style>
 
     <style name="activityAnimationStyle" parent="@android:style/Animation.Activity">