From 65646dddb9122bc56f7de17c0272848bdb3db756 Mon Sep 17 00:00:00 2001
From: Zemiao Zhu <zemiao@google.com>
Date: Fri, 10 Apr 2020 18:58:51 -0700
Subject: Fix text contrast of document list item caption.

Bug: 141218525
Test: manual
Change-Id: Ifdfef709aa50b47d95751dfd6a67025dc63b4cdd
---
 res/color/doc_list_item_subtitle_color.xml | 22 ++++++++++++++++++++++
 res/layout/item_doc_list.xml               |  6 +++---
 res/values-night/colors.xml                |  4 ++++
 res/values/colors.xml                      |  3 +++
 res/values/styles_text.xml                 |  4 ++++
 5 files changed, 36 insertions(+), 3 deletions(-)
 create mode 100644 res/color/doc_list_item_subtitle_color.xml

diff --git a/res/color/doc_list_item_subtitle_color.xml b/res/color/doc_list_item_subtitle_color.xml
new file mode 100644
index 000000000..5f5896e7a
--- /dev/null
+++ b/res/color/doc_list_item_subtitle_color.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2020 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_enabled="false"
+        android:color="@color/doc_list_item_subtitle_disabled" />
+    <item android:color="@color/doc_list_item_subtitle_enabled" />
+</selector>
diff --git a/res/layout/item_doc_list.xml b/res/layout/item_doc_list.xml
index 706d9c226..1189482a2 100644
--- a/res/layout/item_doc_list.xml
+++ b/res/layout/item_doc_list.xml
@@ -117,7 +117,7 @@
                     android:ellipsize="end"
                     android:singleLine="true"
                     android:textAlignment="viewStart"
-                    android:textAppearance="@android:style/TextAppearance.Material.Caption"/>
+                    android:textAppearance="@style/ItemDocListCaptionText"/>
 
                 <TextView
                     android:id="@+id/size"
@@ -128,7 +128,7 @@
                     android:ellipsize="end"
                     android:singleLine="true"
                     android:textAlignment="viewStart"
-                    android:textAppearance="@android:style/TextAppearance.Material.Caption"/>
+                    android:textAppearance="@style/ItemDocListCaptionText"/>
 
                 <TextView
                     android:id="@+id/file_type"
@@ -139,7 +139,7 @@
                     android:ellipsize="end"
                     android:singleLine="true"
                     android:textAlignment="viewStart"
-                    android:textAppearance="@android:style/TextAppearance.Material.Caption"/>
+                    android:textAppearance="@style/ItemDocListCaptionText"/>
             </LinearLayout>
         </LinearLayout>
 
diff --git a/res/values-night/colors.xml b/res/values-night/colors.xml
index 1a6c174ff..86bcbbc48 100644
--- a/res/values-night/colors.xml
+++ b/res/values-night/colors.xml
@@ -29,4 +29,8 @@
 
     <color name="edge_effect">@android:color/white</color>
     <color name="tab_indicator_color">#669DF6</color> <!-- Blue 400 -->
+
+    <!-- AppCompat.textColorSecondary -->
+    <color name="doc_list_item_subtitle_enabled">#b3ffffff</color>
+    <color name="doc_list_item_subtitle_disabled">#36ffffff</color>
 </resources>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 901666430..e00984ada 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -49,4 +49,7 @@
 
     <color name="tab_indicator_color">#1A73E8</color> <!-- Blue 600 -->
     <color name="edge_effect">@android:color/black</color>
+
+    <color name="doc_list_item_subtitle_enabled">#5F6368</color> <!-- Gray 700 -->
+    <color name="doc_list_item_subtitle_disabled">#613c4043</color> <!-- 38% Grey800 -->
 </resources>
diff --git a/res/values/styles_text.xml b/res/values/styles_text.xml
index 3ea510c4b..f90305e0e 100644
--- a/res/values/styles_text.xml
+++ b/res/values/styles_text.xml
@@ -119,4 +119,8 @@
         <item name="fontFamily">@string/config_fontFamilyMedium</item>
     </style>
 
+    <style name="ItemDocListCaptionText" parent="@android:style/TextAppearance.Material.Caption">
+        <item name="android:textColor">@color/doc_list_item_subtitle_color</item>
+    </style>
+
 </resources>
\ No newline at end of file
-- 
cgit v1.2.3-59-g8ed1b