From f79c481b31da69e4cd1294ceb0a01b49c0f15c00 Mon Sep 17 00:00:00 2001
From: Matt Casey <mrcasey@google.com>
Date: Thu, 20 May 2021 16:39:01 -0400
Subject: [PATCH] Fix long screenshot text contrast in dark mode.

Bug: 188821323
Test: Visual verification
Change-Id: I9a3cda60c3da879c8bd013be86009a3095f64e17
---
 packages/SystemUI/res/layout/long_screenshot.xml | 4 ++--
 packages/SystemUI/res/values-night/styles.xml    | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/SystemUI/res/layout/long_screenshot.xml b/packages/SystemUI/res/layout/long_screenshot.xml
index 18a468e9c32b3..8894e5fe55e77 100644
--- a/packages/SystemUI/res/layout/long_screenshot.xml
+++ b/packages/SystemUI/res/layout/long_screenshot.xml
@@ -32,7 +32,7 @@
         android:text="@string/save"
         android:layout_marginLeft="8dp"
         android:backgroundTint="?androidprv:attr/colorAccentSecondary"
-        android:textColor="?androidprv:attr/textColorSecondary"
+        android:textColor="?android:textColorPrimary"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintBottom_toTopOf="@id/preview" />
@@ -114,7 +114,7 @@
         android:backgroundTint="?androidprv:attr/colorAccentSecondary"
         android:src="@drawable/ic_screenshot_edit"
         android:contentDescription="@string/screenshot_edit_label"
-        android:tint="?androidprv:attr/textColorSecondary"
+        android:tint="?android:textColorPrimary"
         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 f03fe3637fbd4..47755bfa3c5de 100644
--- a/packages/SystemUI/res/values-night/styles.xml
+++ b/packages/SystemUI/res/values-night/styles.xml
@@ -35,6 +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>
     </style>
 
 </resources>