From a229cd03cfa41438823c0e8766d3e31ace2356e3 Mon Sep 17 00:00:00 2001
From: Matt Casey <mrcasey@google.com>
Date: Tue, 25 May 2021 10:15:43 -0400
Subject: [PATCH] Separate share icon color from button text.

Different background, doesn't need the textColorPrimaryInverse
workaround.

Bug: 189114751
Test: Visual verification in light and dark themes.
Change-Id: I5e3f97ad5e2427c2eb17bc3717a7ad0a1f6e3260
---
 packages/SystemUI/res/layout/long_screenshot.xml | 4 ++--
 packages/SystemUI/res/values-night/styles.xml    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/SystemUI/res/layout/long_screenshot.xml b/packages/SystemUI/res/layout/long_screenshot.xml
index 9430862db623b..de3384657d9d7 100644
--- a/packages/SystemUI/res/layout/long_screenshot.xml
+++ b/packages/SystemUI/res/layout/long_screenshot.xml
@@ -33,7 +33,7 @@
         android:layout_marginStart="8dp"
         android:layout_marginTop="4dp"
         android:backgroundTint="?androidprv:attr/colorAccentSecondary"
-        android:textColor="?android:textColorPrimary"
+        android:textColor="?android:textColorSecondary"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintBottom_toTopOf="@id/preview" />
@@ -117,7 +117,7 @@
         android:backgroundTint="?androidprv:attr/colorAccentSecondary"
         android:src="@drawable/ic_screenshot_edit"
         android:contentDescription="@string/screenshot_edit_label"
-        android:tint="?android:textColorPrimary"
+        android:tint="?android:textColorSecondary"
         android:padding="16dp"
         android:scaleType="fitCenter"
         app:layout_constraintBottom_toBottomOf="parent"
diff --git a/packages/SystemUI/res/values-night/styles.xml b/packages/SystemUI/res/values-night/styles.xml
index f10a5648973b3..e6165ee500768 100644
--- a/packages/SystemUI/res/values-night/styles.xml
+++ b/packages/SystemUI/res/values-night/styles.xml
@@ -35,7 +35,7 @@
         <item name="android:windowLightStatusBar">false</item>
         <item name="android:windowLightNavigationBar">false</item>
         <item name="android:navigationBarColor">?android:attr/colorBackgroundFloating</item>
-        <item name="android:textColorPrimary">?android:attr/textColorPrimaryInverse</item>
+        <item name="android:textColorSecondary">?android:attr/textColorPrimaryInverse</item>
     </style>
 
     <style name="Screenshot" parent="@android:style/Theme.DeviceDefault.DayNight">