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

Commit 4ed6cb0f authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Uses Theme.DeviceDefault.Light.Panel for non-TV autofill themes."

parents 5d3f2827 fce11904

core/res/res/values-television/themes_device_defaults.xml

+8 −2
Original line number Diff line number Diff line
@@ -16,7 +16,13 @@ 
<resources>

    <style name="Theme.DeviceDefault.Dialog.Alert" parent="Theme.Leanback.Dialog.Alert" />

    <style name="Theme.DeviceDefault.Light.Dialog.Alert" parent="Theme.Leanback.Light.Dialog.Alert" />

    <style name="Theme.DeviceDefault.Autofill" parent="Theme.Material.Autofill" />

    <style name="Theme.DeviceDefault.Autofill.Save" parent="Theme.Material.Autofill.Save" />

    <style name="Theme.DeviceDefault.Autofill" parent="Theme.Material">

    <!-- TODO(b/116457731): remove colorBackground from colors_material.xml if not used anymore -->

        <item name="colorBackground">@color/autofill_background_material_dark</item>

    </style>

    <style name="Theme.DeviceDefault.Autofill.Save" parent="Theme.Material.Panel">

    <!-- TODO(b/116457731): remove colorBackground from colors_material.xml if not used anymore -->

        <item name="colorBackground">@color/autofill_background_material_dark</item>

    </style>

    <style name="Theme.DeviceDefault.Resolver" parent="Theme.Leanback.Resolver" />

</resources>

core/res/res/values/themes_device_defaults.xml

+2 −4
Original line number Diff line number Diff line
@@ -1682,12 +1682,10 @@ easier. 




    <!-- @hide DeviceDefault theme for the autofill FillUi -->

    <style name="Theme.DeviceDefault.Autofill" parent="Theme.Material.Autofill.Light">

    </style>

    <style name="Theme.DeviceDefault.Autofill" parent="Theme.DeviceDefault.Light"/>



    <!-- @hide DeviceDefault theme for the autofill SaveUi -->

    <style name="Theme.DeviceDefault.Autofill.Save" parent="Theme.Material.Autofill.Save.Light">

    </style>

    <style name="Theme.DeviceDefault.Autofill.Save" parent="Theme.DeviceDefault.Light.Panel"/>



    <!-- DeviceDefault theme for the default system theme.  -->

    <style name="Theme.DeviceDefault.System" parent="Theme.DeviceDefault.Light.DarkActionBar" />

core/res/res/values/themes_material.xml

+0 −20
Original line number Diff line number Diff line
@@ -1418,24 +1418,4 @@ please see themes_device_defaults.xml. 
        <item name="colorSecondary">@color/secondary_material_settings</item>

    </style>



    <!-- @hide -->

    <style name="Theme.Material.Autofill" parent="Theme.Material">

        <item name="colorBackground">@color/autofill_background_material_dark</item>

    </style>



    <!-- @hide -->

    <style name="Theme.Material.Autofill.Light" parent="Theme.Material.Light">

        <item name="colorBackground">@color/autofill_background_material_light</item>

    </style>



    <!-- @hide -->

    <style name="Theme.Material.Autofill.Save" parent="Theme.Material.Panel">

        <item name="colorBackground">@color/autofill_background_material_dark</item>

    </style>



    <!-- @hide -->

    <style name="Theme.Material.Autofill.Save.Light" parent="Theme.Material.Light.Panel">

        <item name="colorBackground">@color/autofill_background_material_light</item>

    </style>



</resources>