From c80dc5e5efae157318312223bf863bdf6445fb65 Mon Sep 17 00:00:00 2001
From: Jeff Sharkey <jsharkey@android.com>
Date: Tue, 3 May 2016 17:25:37 -0600
Subject: [PATCH] UX polish tweaks to FallbackHome.

When showing during first boot (before provisioned), render as
completely black to avoid wallpaper jank before showing SUW.  Also
tweak theme used during normal (provisioned) launches to avoid
rendering the dim layer behind status bar.

Bug: 28530777
Change-Id: I4b9e6c54583f07c78d86fbe9bda7f24b6959f4ba
---
 res/values/themes.xml                      | 14 ++++++++++----
 src/com/android/settings/FallbackHome.java |  9 +++++++++
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/res/values/themes.xml b/res/values/themes.xml
index 427e11f0656..ef9e1e08a5a 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -302,10 +302,16 @@
         <item name="suwMarginSides">@dimen/suw_layout_margin_sides</item>
     </style>
 
-    <style name="FallbackHome" parent="@android:style/Theme.Material.Wallpaper.NoTitleBar">
-        <item name="android:windowTranslucentStatus">true</item>
-        <item name="android:windowTranslucentNavigation">true</item>
-        <item name="android:windowAnimationStyle">@null</item>
+    <style name="FallbackHome" parent="@android:style/Theme.DeviceDefault.Light.NoActionBar">
+        <item name="android:windowBackground">@android:color/transparent</item>
+        <item name="android:colorBackgroundCacheHint">@null</item>
+        <item name="android:windowShowWallpaper">true</item>
+        <item name="android:windowNoTitle">true</item>
+        <item name="android:windowTranslucentStatus">false</item>
+        <item name="android:windowTranslucentNavigation">false</item>
+        <item name="android:windowDrawsSystemBarBackgrounds">true</item>
+        <item name="android:statusBarColor">#00000000</item>
+        <item name="android:navigationBarColor">#00000000</item>
     </style>
 
 </resources>
diff --git a/src/com/android/settings/FallbackHome.java b/src/com/android/settings/FallbackHome.java
index d3e6482cd6e..deb01a17642 100644
--- a/src/com/android/settings/FallbackHome.java
+++ b/src/com/android/settings/FallbackHome.java
@@ -26,6 +26,7 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
 import android.os.UserManager;
+import android.provider.Settings;
 import android.util.Log;
 
 import java.util.Objects;
@@ -36,6 +37,14 @@ public class FallbackHome extends Activity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+
+        // Set ourselves totally black before the device is provisioned so that
+        // we don't flash the wallpaper before SUW
+        if (Settings.Global.getInt(getContentResolver(),
+                Settings.Global.DEVICE_PROVISIONED, 0) == 0) {
+            setTheme(android.R.style.Theme_Black_NoTitleBar_Fullscreen);
+        }
+
         registerReceiver(mReceiver, new IntentFilter(Intent.ACTION_USER_UNLOCKED));
         maybeFinish();
     }