Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix DeviceDefault theme/style bugs where parent styles were incorrectly specified." into ics-mr1

Browse Source
This commit is contained in:
Adam Powell
2012-01-18 14:47:20 -08:00
committed by Android (Google) Code Review
parent 013dbcf078 c8fcde2b6b
commit 04f3848986
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/res/res/values/styles_device_defaults.xml
View File

@@ -687,7 +687,7 @@ easier.
<style name="AlertDialog.DeviceDefault" parent="AlertDialog.Holo"> <style name="AlertDialog.DeviceDefault" parent="AlertDialog.Holo">
</style> </style>
<style name="AlertDialog.DeviceDefault.Light" parent="AlertDialog.DeviceDefault.Light" > <style name="AlertDialog.DeviceDefault.Light" parent="AlertDialog.Holo.Light" >
</style> </style>

6
core/res/res/values/themes_device_defaults.xml
View File

@@ -411,13 +411,13 @@ easier.
<style name="Theme.DeviceDefault.Dialog.Alert" parent="Theme.Holo.Dialog.Alert"> <style name="Theme.DeviceDefault.Dialog.Alert" parent="Theme.Holo.Dialog.Alert">
<item name="windowTitleStyle">@android:style/DialogWindowTitle.DeviceDefault</item> <item name="windowTitleStyle">@android:style/DialogWindowTitle.DeviceDefault</item>
</style> </style>
<style name="Theme.DeviceDefault.Light.Dialog.Alert" parent="Theme.DeviceDefault.Light.Dialog.Alert"> <style name="Theme.DeviceDefault.Light.Dialog.Alert" parent="Theme.Holo.Light.Dialog.Alert">
<item name="windowTitleStyle">@android:style/DialogWindowTitle.DeviceDefault.Light</item> <item name="windowTitleStyle">@android:style/DialogWindowTitle.DeviceDefault.Light</item>
</style> </style>
<style name="Theme.DeviceDefault.SearchBar" parent="Theme.DeviceDefault.SearchBar"> <style name="Theme.DeviceDefault.SearchBar" parent="Theme.Holo.SearchBar">
</style> </style>
<style name="Theme.DeviceDefault.Light.SearchBar" parent="Theme.DeviceDefault.Light.SearchBar"> <style name="Theme.DeviceDefault.Light.SearchBar" parent="Theme.Holo.Light.SearchBar">
</style> </style>