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

Commit 56ba1119 authored by Robin Lee's avatar Robin Lee Committed by Automerger Merge Worker
Browse files

Merge "Fix crash on TV caused by new iconFactory attrs" into rvc-dev am: 848cfed7 am: f6d1bc1b 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11734067

Change-Id: Ieebceb28ba42af88f0c16eef0fcaffa4fa0054f3
parents eb0f7f5c f6d1bc1b

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. -->