diff options
| author | Jeff Sharkey <jsharkey@google.com> | 2016-02-24 03:48:59 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-02-24 03:48:59 +0000 |
| commit | e57f7cbc8c80d298bbbd63b7536acd67c7f95df4 (patch) | |
| tree | 853b1d62a39ea09cb849a190c69e17e8736f646d | |
| parent | 1a157e69b4f190a0f6bf2992a397c830b215f3cb (diff) | |
| parent | e555a6f61003fe5b06e6646c6225726275f36f23 (diff) | |
| download | packages_apps_Settings-e57f7cbc8c80d298bbbd63b7536acd67c7f95df4.tar.gz packages_apps_Settings-e57f7cbc8c80d298bbbd63b7536acd67c7f95df4.tar.bz2 packages_apps_Settings-e57f7cbc8c80d298bbbd63b7536acd67c7f95df4.zip | |
Merge "Make fallback home a bit more graceful." into nyc-dev
| -rw-r--r-- | AndroidManifest.xml | 2 | ||||
| -rw-r--r-- | res/values/themes.xml | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 620fbd22fd..61b62cbee7 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -2258,7 +2258,7 @@ <!-- Triggered when user-selected home app isn't encryption aware --> <activity android:name=".FallbackHome" android:excludeFromRecents="true" - android:theme="@android:style/Theme.Translucent.NoTitleBar"> + android:theme="@style/FallbackHome"> <intent-filter android:priority="-1000"> <action android:name="android.intent.action.MAIN" /> <category android:name="android.intent.category.HOME" /> diff --git a/res/values/themes.xml b/res/values/themes.xml index a4393227ba..6bb68be342 100644 --- a/res/values/themes.xml +++ b/res/values/themes.xml @@ -298,4 +298,10 @@ <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> + </resources> |