Fix bug #16356067 adb shell am start -a android.settings.DEVICE_INFO_SETTINGS is crashing again

- regression from 9717fab53d
- add the missing dashboardBackgroundColor attribute to the DialogWhenLarge Themes

Change-Id: I9f7e21d33851966350726e4b3bf79a5a4d12a37f
This commit is contained in:
Fabrice Di Meglio
2014-07-16 17:02:41 -07:00
parent 7d79e41877
commit a874180fbe

View File

@@ -141,6 +141,8 @@
<!-- Redefine the ActionBar style for contentInsetStart --> <!-- Redefine the ActionBar style for contentInsetStart -->
<item name="android:actionBarStyle">@style/Theme.ActionBar</item> <item name="android:actionBarStyle">@style/Theme.ActionBar</item>
<item name="dashboardBackgroundColor">@color/dashboard_background_color</item>
</style> </style>
<style name="Theme.CryptKeeper" parent="@android:style/Theme.Material.Light.NoActionBar"> <style name="Theme.CryptKeeper" parent="@android:style/Theme.Material.Light.NoActionBar">
@@ -153,6 +155,8 @@
<style name="Theme.SubSettingsDialogWhenLarge" parent="Theme.DialogWhenLarge"> <style name="Theme.SubSettingsDialogWhenLarge" parent="Theme.DialogWhenLarge">
<item name="android:actionBarWidgetTheme">@null</item> <item name="android:actionBarWidgetTheme">@null</item>
<item name="android:actionBarTheme">@android:style/ThemeOverlay.Material.Dark.ActionBar</item> <item name="android:actionBarTheme">@android:style/ThemeOverlay.Material.Dark.ActionBar</item>
<item name="dashboardBackgroundColor">@color/dashboard_background_color</item>
</style> </style>
<style name="Theme.AlertDialog" parent="@*android:style/Theme.Material.Light.Dialog.Alert"> <style name="Theme.AlertDialog" parent="@*android:style/Theme.Material.Light.Dialog.Alert">
@@ -172,6 +176,8 @@
<style name="Theme.NotificationStation" parent="@android:style/Theme.Material"> <style name="Theme.NotificationStation" parent="@android:style/Theme.Material">
<item name="switchBarMarginStart">0dip</item> <item name="switchBarMarginStart">0dip</item>
<item name="switchBarMarginEnd">0dip</item> <item name="switchBarMarginEnd">0dip</item>
<item name="dashboardBackgroundColor">@android:color/transparent</item> <item name="dashboardBackgroundColor">@android:color/transparent</item>
</style> </style>
</resources> </resources>