Skip to content

Commit c8fcde2

Browse files
committed
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
1 parent 3938e4f commit c8fcde2

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

core/res/res/values/styles_device_defaults.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -687,7 +687,7 @@ easier.
687687
<style name="AlertDialog.DeviceDefault" parent="AlertDialog.Holo">
688688

689689
</style>
690-
<style name="AlertDialog.DeviceDefault.Light" parent="AlertDialog.DeviceDefault.Light" >
690+
<style name="AlertDialog.DeviceDefault.Light" parent="AlertDialog.Holo.Light" >
691691

692692
</style>
693693

core/res/res/values/themes_device_defaults.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -411,13 +411,13 @@ easier.
411411
<style name="Theme.DeviceDefault.Dialog.Alert" parent="Theme.Holo.Dialog.Alert">
412412
<item name="windowTitleStyle">@android:style/DialogWindowTitle.DeviceDefault</item>
413413
</style>
414-
<style name="Theme.DeviceDefault.Light.Dialog.Alert" parent="Theme.DeviceDefault.Light.Dialog.Alert">
414+
<style name="Theme.DeviceDefault.Light.Dialog.Alert" parent="Theme.Holo.Light.Dialog.Alert">
415415
<item name="windowTitleStyle">@android:style/DialogWindowTitle.DeviceDefault.Light</item>
416416
</style>
417-
<style name="Theme.DeviceDefault.SearchBar" parent="Theme.DeviceDefault.SearchBar">
417+
<style name="Theme.DeviceDefault.SearchBar" parent="Theme.Holo.SearchBar">
418418

419419
</style>
420-
<style name="Theme.DeviceDefault.Light.SearchBar" parent="Theme.DeviceDefault.Light.SearchBar">
420+
<style name="Theme.DeviceDefault.Light.SearchBar" parent="Theme.Holo.Light.SearchBar">
421421

422422
</style>
423423

0 commit comments

Comments
 (0)