From 486ee39d0791d290411290af6d2e54f37436b09f Mon Sep 17 00:00:00 2001
From: Gilles Franck Mevaa <gillesd@google.com>
Date: Tue, 16 Feb 2016 14:10:03 -0800
Subject: DO NOT MERGE: Listener of spam events

Getting rid of the Manager to have the ButtonRenderer directly
communicate changes to an event listener. Implementation changes
in ag/863096.

Cherry picking to nyc-dev to fix build.

Change-Id: I8061116f0b91e3f5a6a3a6eac09fe2171ebcbd5c
---
 res/drawable/blocked_contact.xml | 2 +-
 res/values/colors.xml            | 2 +-
 res/values/strings.xml           | 3 +++
 3 files changed, 5 insertions(+), 2 deletions(-)

(limited to 'res')

diff --git a/res/drawable/blocked_contact.xml b/res/drawable/blocked_contact.xml
index 2e7343710..0957585b4 100644
--- a/res/drawable/blocked_contact.xml
+++ b/res/drawable/blocked_contact.xml
@@ -25,7 +25,7 @@
         </shape>
     </item>
 
-    <item android:drawable="@drawable/ic_block_24dp"
+    <item android:drawable="@drawable/ic_report_24dp"
         android:width="18dp"
         android:height="18dp"
         android:gravity="center" />
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 75d05ac99..38fd6b39a 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -124,7 +124,7 @@
     <color name="divider_line_color">#D8D8D8</color>
 
     <!--  Colors for blocked numbers list -->
-    <color name="blocked_contact_background">#afafaf</color>
+    <color name="blocked_contact_background">@android:color/holo_red_dark</color>
     <color name="blocked_number_primary_text_color">@color/dialtacts_primary_text_color</color>
     <color name="blocked_number_secondary_text_color">@color/dialtacts_secondary_text_color</color>
     <color name="blocked_number_icon_tint">#616161</color>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index ed88b960f..6d2bd5ef5 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -995,4 +995,7 @@
 
     <!-- Shown as a message that notifies the user that the Phone app cannot write to system settings, which is why the system settings app is being launched directly instead. [CHAR LIMIT=NONE]-->
     <string name="toast_cannot_write_system_settings">Phone app does not have permission to write to system settings.</string>
+
+    <!-- Label under the name of a blocked number in the call log. [CHAR LIMIT=15] -->
+    <string name="blocked_number_call_log_label">Blocked</string>
 </resources>
-- 
cgit v1.2.3