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

Merge "Controls UI - Fix routine icons" into rvc-dev

Browse Source
This commit is contained in:
Matt Pietal
2020-03-26 23:05:35 +00:00
committed by Android (Google) Code Review
parent f7b0b5a373 f8cc0fa2ad
commit f77d4b3d3e
4 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/SystemUI/res/layout/controls_base_item.xml
View File

@@ -30,8 +30,8 @@
<ImageView <ImageView
android:id="@+id/icon" android:id="@+id/icon"
android:layout_width="wrap_content" android:layout_width="@dimen/control_icon_size"
android:layout_height="wrap_content" android:layout_height="@dimen/control_icon_size"
android:paddingTop="@dimen/control_padding_adjustment" android:paddingTop="@dimen/control_padding_adjustment"
android:clickable="false" android:clickable="false"
android:focusable="false" android:focusable="false"

1
packages/SystemUI/res/values/dimens.xml
View File

@@ -1225,6 +1225,7 @@
<dimen name="controls_top_margin">44dp</dimen> <dimen name="controls_top_margin">44dp</dimen>
<dimen name="control_header_text_size">22sp</dimen> <dimen name="control_header_text_size">22sp</dimen>
<dimen name="control_text_size">14sp</dimen> <dimen name="control_text_size">14sp</dimen>
<dimen name="control_icon_size">24dp</dimen>
<dimen name="control_spacing">4dp</dimen> <dimen name="control_spacing">4dp</dimen>
<dimen name="control_list_divider">1dp</dimen> <dimen name="control_list_divider">1dp</dimen>
<dimen name="control_corner_radius">12dp</dimen> <dimen name="control_corner_radius">12dp</dimen>

7
packages/SystemUI/src/com/android/systemui/controls/ui/ControlViewHolder.kt
View File

@@ -21,6 +21,7 @@ import android.graphics.drawable.ClipDrawable
import android.graphics.drawable.GradientDrawable import android.graphics.drawable.GradientDrawable
import android.graphics.drawable.LayerDrawable import android.graphics.drawable.LayerDrawable
import android.service.controls.Control import android.service.controls.Control
import android.service.controls.DeviceTypes
import android.service.controls.actions.ControlAction import android.service.controls.actions.ControlAction
import android.service.controls.templates.ControlTemplate import android.service.controls.templates.ControlTemplate
import android.service.controls.templates.StatelessTemplate import android.service.controls.templates.StatelessTemplate
@@ -156,7 +157,11 @@ class ControlViewHolder(
statusExtra.setTextColor(fg) statusExtra.setTextColor(fg)
icon.setImageDrawable(ri.icon) icon.setImageDrawable(ri.icon)
icon.setImageTintList(fg)
// do not color app icons
if (deviceType != DeviceTypes.TYPE_ROUTINE) {
icon.setImageTintList(fg)
}
(clipLayer.getDrawable() as GradientDrawable).apply { (clipLayer.getDrawable() as GradientDrawable).apply {
setColor(context.getResources().getColor(bg, context.getTheme())) setColor(context.getResources().getColor(bg, context.getTheme()))

2
packages/SystemUI/src/com/android/systemui/controls/ui/RenderInfo.kt
View File

@@ -64,7 +64,7 @@ data class RenderInfo(
val iconState = deviceIconMap.getValue(iconKey) val iconState = deviceIconMap.getValue(iconKey)
val resourceId = iconState[enabled] val resourceId = iconState[enabled]
var icon: Drawable? = null var icon: Drawable?
if (resourceId == APP_ICON_ID) { if (resourceId == APP_ICON_ID) {
icon = appIconMap.get(componentName) icon = appIconMap.get(componentName)
if (icon == null) { if (icon == null) {