Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ea77ed02 authored by Adam Powell's avatar Adam Powell Committed by Android Git Automerger
Browse files

am a6a0d134: am 04f38489: Merge "Fix DeviceDefault theme/style bugs where... 

am a6a0d134: am 04f38489: Merge "Fix DeviceDefault theme/style bugs where parent styles were incorrectly specified." into ics-mr1

* commit 'a6a0d134':
  Fix DeviceDefault theme/style bugs where parent styles were incorrectly specified.
parents 2a16b137 a6a0d134

core/res/res/values/styles_device_defaults.xml

+1 −1
Original line number Diff line number Diff line
@@ -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>

core/res/res/values/themes_device_defaults.xml

+3 −3
Original line number Diff line number Diff line
@@ -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>