diff options
| author | 2012-01-18 14:51:35 -0800 | |
|---|---|---|
| committer | 2012-01-18 14:51:35 -0800 | |
| commit | ea77ed02e44ebd177e3c7e1797d9cb804820ce43 (patch) | |
| tree | 88478009dd14e8c97eb8f2afde0d27fc3d229b6b | |
| parent | 2a16b1374413abe513c0b60597262d45360138f7 (diff) | |
| parent | a6a0d134ebfb0931473c5e54f21ff543e08b4a91 (diff) | |
am a6a0d134: am 04f38489: Merge "Fix DeviceDefault theme/style bugs where parent styles were incorrectly specified." into ics-mr1
* commit 'a6a0d134ebfb0931473c5e54f21ff543e08b4a91':
Fix DeviceDefault theme/style bugs where parent styles were incorrectly specified.
| -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 7f1891e8d52d..64198728515f 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 94d2c381349d..813598641184 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> |