PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "UX polish tweaks to FallbackHome." into nyc-dev am: e50853f485 am: 0d613ab2cf

Browse Source 
am: 6bb1f8146b

* commit '6bb1f8146b048110be3e25fdafe2d8045abaaae6':
  UX polish tweaks to FallbackHome.

Change-Id: I882caf4bc033a801936fa4321a99360b26abc29d
This commit is contained in:
Jeff Sharkey
2016-05-04 18:44:54 +00:00
committed by android-build-merger
parent 517ff0deee 6bb1f8146b
commit cd012ff953
2 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
res/values/themes.xml
View File

@@ -300,10 +300,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>

9
src/com/android/settings/FallbackHome.java
View File

@@ -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();
}