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

Browse Source
This commit is contained in:
Robin Lee
2020-06-05 16:29:34 +00:00
committed by Android (Google) Code Review
parent ae0368040f 32f87499db
commit 848cfed7df
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.Autofill.Light" parent="Theme.DeviceDefault.Autofill"/>
<style name="Theme.DeviceDefault.Light.Autofill.Save" parent="Theme.DeviceDefault.Autofill.Save"/> <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> </resources>

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

@@ -128,6 +128,10 @@
<!-- Toolbar attributes --> <!-- Toolbar attributes -->
<item name="toolbarStyle">@style/Widget.DeviceDefault.Toolbar</item> <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> </style>
<!-- @hide Special theme for the default system Activity-based Alert dialogs. --> <!-- @hide Special theme for the default system Activity-based Alert dialogs. -->