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

Commit 848cfed7 authored by Robin Lee's avatar Robin Lee Committed by Android (Google) Code Review
Browse files

Merge "Fix crash on TV caused by new iconFactory attrs" into rvc-dev

parents ae036804 32f87499

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

+2 −1
Original line number Diff line number Diff line
@@ -33,5 +33,6 @@ 
    <style name="Theme.DeviceDefault.Autofill.Light" parent="Theme.DeviceDefault.Autofill"/>

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



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

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

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

</resources>

core/res/res/values/themes_leanback.xml

+4 −0
Original line number Diff line number Diff line
@@ -128,6 +128,10 @@ 


        <!-- Toolbar attributes -->

        <item name="toolbarStyle">@style/Widget.DeviceDefault.Toolbar</item>



        <!-- Icon sizes -->

        <item name="iconfactoryIconSize">@dimen/resolver_icon_size</item>

        <item name="iconfactoryBadgeSize">@dimen/resolver_badge_size</item>

      </style>



    <!-- @hide Special theme for the default system Activity-based Alert dialogs. -->