From c7e0c4855080e05a29137915ed1874a7611d1b3a Mon Sep 17 00:00:00 2001
From: Zemiao Zhu <zemiao@google.com>
Date: Mon, 19 Apr 2021 17:50:05 -0700
Subject: Update colors to use dynamic color for Pixel.

Bug: 185831119
Test: manual
Change-Id: Ib1d3dc89374d73ff79c1ffd68c330f621e6b79c0
---
 res/layout/directory_header.xml           |  4 ++--
 res/layout/drawer_layout.xml              |  2 +-
 res/layout/item_doc_grid.xml              |  1 +
 res/layout/item_doc_header_message.xml    |  1 +
 res/layout/item_doc_list.xml              | 14 ++++----------
 res/layout/navigation_breadcrumb_item.xml |  1 -
 6 files changed, 9 insertions(+), 14 deletions(-)

(limited to 'res/layout')

diff --git a/res/layout/directory_header.xml b/res/layout/directory_header.xml
index b7ab7d96a..6a222d5c3 100644
--- a/res/layout/directory_header.xml
+++ b/res/layout/directory_header.xml
@@ -46,8 +46,8 @@
             app:tabMaxWidth="0dp"
             app:tabGravity="fill"
             app:tabMode="fixed"
-            app:tabIndicatorColor="@color/tab_indicator_color"
-            app:tabSelectedTextColor="@color/tab_indicator_color"
+            app:tabIndicatorColor="?android:attr/colorAccent"
+            app:tabSelectedTextColor="?android:attr/colorAccent"
             app:tabTextAppearance="@style/TabTextAppearance"
             app:tabTextColor="?android:attr/textColorSecondary"/>
 
diff --git a/res/layout/drawer_layout.xml b/res/layout/drawer_layout.xml
index 7cb185fad..b5bfc66a1 100644
--- a/res/layout/drawer_layout.xml
+++ b/res/layout/drawer_layout.xml
@@ -88,7 +88,7 @@
                 android:background="?android:attr/colorBackground"
                 android:elevation="0dp"
                 app:titleTextAppearance="@style/DrawerMenuTitle"
-                app:titleTextColor="?android:colorPrimary"/>
+                app:titleTextColor="?android:colorAccent"/>
 
             <FrameLayout
                 android:id="@+id/container_roots"
diff --git a/res/layout/item_doc_grid.xml b/res/layout/item_doc_grid.xml
index 0722a9d16..9159a20d3 100644
--- a/res/layout/item_doc_grid.xml
+++ b/res/layout/item_doc_grid.xml
@@ -50,6 +50,7 @@
 
             <FrameLayout
                 android:id="@+id/thumbnail"
+                android:background="?android:attr/colorBackground"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
 
diff --git a/res/layout/item_doc_header_message.xml b/res/layout/item_doc_header_message.xml
index 416fbe9c4..4b2cf355f 100644
--- a/res/layout/item_doc_header_message.xml
+++ b/res/layout/item_doc_header_message.xml
@@ -34,6 +34,7 @@
         <LinearLayout
             android:layout_height="wrap_content"
             android:layout_width="match_parent"
+            android:background="?android:attr/colorBackground"
             android:orientation="vertical">
 
             <LinearLayout
diff --git a/res/layout/item_doc_list.xml b/res/layout/item_doc_list.xml
index 9238676cf..ce8925dd2 100644
--- a/res/layout/item_doc_list.xml
+++ b/res/layout/item_doc_list.xml
@@ -16,18 +16,13 @@
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/item_root"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:background="@drawable/list_item_background"
+    android:focusable="true"
     android:orientation="vertical">
 
-  <LinearLayout
-      android:id="@+id/item_root"
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:background="@drawable/list_item_background"
-      android:focusable="true"
-      android:orientation="horizontal">
-
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -49,6 +44,7 @@
         <com.google.android.material.card.MaterialCardView
             android:layout_width="match_parent"
             android:layout_height="match_parent"
+            app:cardBackgroundColor="@android:color/transparent"
             app:cardElevation="0dp">
 
           <ImageView
@@ -154,8 +150,6 @@
 
     </LinearLayout>
 
-  </LinearLayout>
-
   <View
       android:layout_width="match_parent"
       android:layout_height="1dp"
diff --git a/res/layout/navigation_breadcrumb_item.xml b/res/layout/navigation_breadcrumb_item.xml
index a424a66ec..93d3feb3f 100644
--- a/res/layout/navigation_breadcrumb_item.xml
+++ b/res/layout/navigation_breadcrumb_item.xml
@@ -40,7 +40,6 @@
         android:layout_height="match_parent"
         android:maxWidth="275dp"
         android:gravity="center_vertical"
-        android:duplicateParentState="true"
         android:maxLines="1"
         android:ellipsize="end"
         android:textAppearance="@style/BreadcrumbText"
-- 
cgit v1.2.3-59-g8ed1b