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

Merge "Fix alignment of subtitle" into rvc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2020-04-24 21:34:26 +00:00
committed by Android (Google) Code Review
parent d5d8f6b69c 98ef196f8b
commit 9178d7db09
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/SystemUI/src/com/android/systemui/controls/management/AppAdapter.kt
View File

@@ -102,7 +102,9 @@ class AppAdapter(
fun bindData(data: ControlsServiceInfo) { fun bindData(data: ControlsServiceInfo) {
icon.setImageDrawable(data.loadIcon()) icon.setImageDrawable(data.loadIcon())
title.text = data.loadLabel() title.text = data.loadLabel()
favorites.text = favRenderer.renderFavoritesForComponent(data.componentName) val text = favRenderer.renderFavoritesForComponent(data.componentName)
favorites.text = text
favorites.visibility = if (text == null) View.GONE else View.VISIBLE
} }
} }
} }
@@ -112,12 +114,12 @@ class FavoritesRenderer(
private val favoriteFunction: (ComponentName) -> Int private val favoriteFunction: (ComponentName) -> Int
) { ) {
fun renderFavoritesForComponent(component: ComponentName): String { fun renderFavoritesForComponent(component: ComponentName): String? {
val qty = favoriteFunction(component) val qty = favoriteFunction(component)
if (qty != 0) { if (qty != 0) {
return resources.getQuantityString(R.plurals.controls_number_of_favorites, qty, qty) return resources.getQuantityString(R.plurals.controls_number_of_favorites, qty, qty)
} else { } else {
return "" return null
} }
} }
} }