Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I33ebbb949503da3c3aa9db5612909a4e4b511a2d
This commit is contained in:
Robin Lee
2020-06-05 16:35:26 +00:00
committed by Automerger Merge Worker
parent d8f9117cd9 848cfed7df
commit c3d018e0af
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/res/res/values-television/themes_device_defaults.xml
View File

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

4
core/res/res/values/themes_leanback.xml
View File

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