From 4fb0b8ebe4e411a2b73688adb01c8ae86a7852c6 Mon Sep 17 00:00:00 2001
From: Andrew Lee <anwlee@google.com>
Date: Mon, 13 Apr 2015 13:44:52 -0700
Subject: Make call log cards white.

Disassociate the color of the cards/list items from the background
color. Before, they were connected so they were ending up as the
same color.

Bug: 19372817
Change-Id: Id31891a0f86f98bd6143911e361abc70435abddf
---
 res/layout/call_detail.xml        | 2 +-
 res/layout/call_log_fragment.xml  | 4 ++--
 res/layout/call_log_list_item.xml | 2 +-
 res/layout/playback_layout.xml    | 2 +-
 res/values/colors.xml             | 5 ++---
 5 files changed, 7 insertions(+), 8 deletions(-)

(limited to 'res')

diff --git a/res/layout/call_detail.xml b/res/layout/call_detail.xml
index 522c698ad..c07785159 100644
--- a/res/layout/call_detail.xml
+++ b/res/layout/call_detail.xml
@@ -24,7 +24,7 @@
         android:orientation="vertical"
         android:layout_alignParentStart="true"
         android:layout_alignParentTop="true"
-        android:background="@color/background_dialer_details_list_items" >
+        android:background="@color/background_dialer_call_log" >
         <!-- Caller information "card" -->
         <LinearLayout
             android:id="@+id/caller_information"
diff --git a/res/layout/call_log_fragment.xml b/res/layout/call_log_fragment.xml
index ff0d58e00..cee6af15e 100644
--- a/res/layout/call_log_fragment.xml
+++ b/res/layout/call_log_fragment.xml
@@ -21,7 +21,7 @@
     android:orientation="vertical"
     android:divider="?android:attr/dividerHorizontal"
     android:showDividers="end"
-    android:background="@color/background_dialer_list_items">
+    android:background="@color/background_dialer_call_log">
 
     <FrameLayout
         android:id="@+id/voicemail_status"
@@ -40,7 +40,7 @@
         <android.support.v7.widget.RecyclerView android:id="@+id/recycler_view"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:background="@color/background_dialer_list_items"
+            android:background="@color/background_dialer_call_log"
             android:padding="8dp" />
 
         <include
diff --git a/res/layout/call_log_list_item.xml b/res/layout/call_log_list_item.xml
index 1fbc579d9..9ea3db8d0 100644
--- a/res/layout/call_log_list_item.xml
+++ b/res/layout/call_log_list_item.xml
@@ -47,7 +47,7 @@
         android:orientation="vertical"
         android:gravity="center_vertical"
         card_view:cardCornerRadius="4dp"
-        card_view:cardBackgroundColor="@color/background_dialer_list_items">
+        card_view:cardBackgroundColor="@color/background_dialer_call_log_list_item">
 
         <!-- Primary area containing the contact badge and caller information -->
         <LinearLayout
diff --git a/res/layout/playback_layout.xml b/res/layout/playback_layout.xml
index 54d0c5955..00f1c3f4a 100644
--- a/res/layout/playback_layout.xml
+++ b/res/layout/playback_layout.xml
@@ -19,7 +19,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
-    android:background="@color/background_dialer_list_items"
+    android:background="@color/background_dialer_call_log_list_item"
 >
     <!-- Mute, playback, trash buttons. -->
     <LinearLayout
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 2954d75ba..25f203dac 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -57,9 +57,8 @@
     <color name="background_dialer_light">#fafafa</color>
     <!-- Background color for search results and call details -->
     <color name="background_dialer_results">#f9f9f9</color>
-    <!-- Background color of dialer list items (contacts, call log entries) -->
-    <color name="background_dialer_list_items">@color/background_dialer_white</color>
-    <color name="background_dialer_details_list_items">@color/background_dialer_results</color>
+    <color name="background_dialer_call_log">@color/background_dialer_light</color>
+    <color name="background_dialer_call_log_list_item">@color/background_dialer_white</color>
 
     <!-- Color of the 1dp divider that separates favorites -->
     <color name="favorite_contacts_separator_color">#d0d0d0</color>
-- 
cgit v1.2.3