From 90a8354a03276b762aedd8dbb69280828da22002 Mon Sep 17 00:00:00 2001
From: Miranda Kephart <mkephart@google.com>
Date: Fri, 14 Aug 2020 15:05:33 -0400
Subject: [PATCH] Use theme color for screenshot UI icons

Bug: 162377061
Fix: 162377061
Test: manual (tested in light/dark modes, ensured that smart
screenshot actions are not tinted)

Change-Id: I00b2cb91af1df057501d35394f1c6ab63990f8d5
---
 .../SystemUI/res/layout/global_screenshot_action_chip.xml   | 1 +
 .../android/systemui/screenshot/ScreenshotActionChip.java   | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/SystemUI/res/layout/global_screenshot_action_chip.xml b/packages/SystemUI/res/layout/global_screenshot_action_chip.xml
index 46396e3e62b43..4b3534b1cbc88 100644
--- a/packages/SystemUI/res/layout/global_screenshot_action_chip.xml
+++ b/packages/SystemUI/res/layout/global_screenshot_action_chip.xml
@@ -32,6 +32,7 @@
         android:gravity="center">
         <ImageView
             android:id="@+id/screenshot_action_chip_icon"
+            android:tint="@*android:color/accent_device_default"
             android:layout_width="@dimen/screenshot_action_chip_icon_size"
             android:layout_height="@dimen/screenshot_action_chip_icon_size"
             android:layout_marginStart="@dimen/screenshot_action_chip_padding_start"
diff --git a/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotActionChip.java b/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotActionChip.java
index b5209bbbdd213..a488702403842 100644
--- a/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotActionChip.java
+++ b/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotActionChip.java
@@ -65,10 +65,10 @@ public class ScreenshotActionChip extends FrameLayout {
     }
 
     void setIcon(Icon icon, boolean tint) {
-        if (tint) {
-            icon.setTint(mIconColor);
-        }
         mIcon.setImageIcon(icon);
+        if (!tint) {
+            mIcon.setImageTintList(null);
+        }
     }
 
     void setText(CharSequence text) {