diff options
| author | Adam Powell <adamp@google.com> | 2012-01-18 14:47:20 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-01-18 14:47:20 -0800 |
| commit | 04f3848986efda8cf006f575d2e4990f120a1bc8 (patch) | |
| tree | f2bd572b9536ff938cebeb770303136c31f7f678 | |
| parent | 013dbcf0783f55efbb75e6c2794478c27d172c8c (diff) | |
| parent | c8fcde2b6b1cd74bd4ae48cc46b8ee6242c7a450 (diff) | |
| download | frameworks_base-04f3848986efda8cf006f575d2e4990f120a1bc8.zip frameworks_base-04f3848986efda8cf006f575d2e4990f120a1bc8.tar.gz frameworks_base-04f3848986efda8cf006f575d2e4990f120a1bc8.tar.bz2 | |
Merge "Fix DeviceDefault theme/style bugs where parent styles were incorrectly specified." into ics-mr1
| -rw-r--r-- | core/res/res/values/styles_device_defaults.xml | 2 | ||||
| -rw-r--r-- | core/res/res/values/themes_device_defaults.xml | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/core/res/res/values/styles_device_defaults.xml b/core/res/res/values/styles_device_defaults.xml index 7f1891e..6419872 100644 --- a/core/res/res/values/styles_device_defaults.xml +++ b/core/res/res/values/styles_device_defaults.xml @@ -687,7 +687,7 @@ easier. <style name="AlertDialog.DeviceDefault" parent="AlertDialog.Holo"> </style> - <style name="AlertDialog.DeviceDefault.Light" parent="AlertDialog.DeviceDefault.Light" > + <style name="AlertDialog.DeviceDefault.Light" parent="AlertDialog.Holo.Light" > </style> diff --git a/core/res/res/values/themes_device_defaults.xml b/core/res/res/values/themes_device_defaults.xml index 94d2c38..8135986 100644 --- a/core/res/res/values/themes_device_defaults.xml +++ b/core/res/res/values/themes_device_defaults.xml @@ -411,13 +411,13 @@ easier. <style name="Theme.DeviceDefault.Dialog.Alert" parent="Theme.Holo.Dialog.Alert"> <item name="windowTitleStyle">@android:style/DialogWindowTitle.DeviceDefault</item> </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> </style> - <style name="Theme.DeviceDefault.SearchBar" parent="Theme.DeviceDefault.SearchBar"> + <style name="Theme.DeviceDefault.SearchBar" parent="Theme.Holo.SearchBar"> </style> - <style name="Theme.DeviceDefault.Light.SearchBar" parent="Theme.DeviceDefault.Light.SearchBar"> + <style name="Theme.DeviceDefault.Light.SearchBar" parent="Theme.Holo.Light.SearchBar"> </style> |