summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorAdam Powell <adamp@google.com>2012-01-17 12:51:39 -0800
committerAdam Powell <adamp@google.com>2012-01-17 12:58:23 -0800
commitc8fcde2b6b1cd74bd4ae48cc46b8ee6242c7a450 (patch)
tree1e958a14e79d32a12bd9313dc21e5259fcf50370 /core
parent3938e4fbaae132db9b4676ba26f6b3c042a6879e (diff)
downloadframeworks_base-c8fcde2b6b1cd74bd4ae48cc46b8ee6242c7a450.zip
frameworks_base-c8fcde2b6b1cd74bd4ae48cc46b8ee6242c7a450.tar.gz
frameworks_base-c8fcde2b6b1cd74bd4ae48cc46b8ee6242c7a450.tar.bz2
Fix DeviceDefault theme/style bugs where parent styles were
incorrectly specified. This affected search bars and alert dialogs spawned from activities using Theme.DeviceDefault.Light as a base. Change-Id: I219d38d486498db5b4b283560256afd7d6051535
Diffstat (limited to 'core')
-rw-r--r--core/res/res/values/styles_device_defaults.xml2
-rw-r--r--core/res/res/values/themes_device_defaults.xml6
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>