From b4d44a2f5f9a6b07f56f2312d583921a9eff0b2b Mon Sep 17 00:00:00 2001
From: Andrey Epin <ayepin@google.com>
Date: Mon, 6 Feb 2023 15:21:53 -0800
Subject: Explicitly tint chooser action icons

Fix: 267509997
Test: manual test
Change-Id: I2f0f559f4aff0ce85d083cc60544b99a1d809e57
---
 java/src/com/android/intentresolver/widget/ScrollableActionRow.kt | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'java')

diff --git a/java/src/com/android/intentresolver/widget/ScrollableActionRow.kt b/java/src/com/android/intentresolver/widget/ScrollableActionRow.kt
index 81630545..f2a8b9e8 100644
--- a/java/src/com/android/intentresolver/widget/ScrollableActionRow.kt
+++ b/java/src/com/android/intentresolver/widget/ScrollableActionRow.kt
@@ -88,11 +88,12 @@ class ScrollableActionRow : RecyclerView, ActionRow {
     ) : RecyclerView.ViewHolder(view) {
 
         fun bind(action: ActionRow.Action) {
-            if (action.icon != null) {
-                action.icon.setBounds(0, 0, iconSize, iconSize)
+            action.icon?.let { icon ->
+                icon.setBounds(0, 0, iconSize, iconSize)
                 // some drawables (edit) does not gets tinted when set to the top of the text
                 // with TextView#setCompoundDrawableRelative
-                view.setCompoundDrawablesRelative(null, action.icon, null, null)
+                tintIcon(icon, view)
+                view.setCompoundDrawablesRelative(null, icon, null, null)
             }
             view.text = action.label ?: ""
             view.setOnClickListener {
-- 
cgit v1.2.3-59-g8ed1b