From 4bbb9c8b606eee55462bfd5d96c50d4fbabe819f Mon Sep 17 00:00:00 2001
From: Qi Wang <wangqi@google.com>
Date: Thu, 31 Mar 2016 11:11:01 -0700
Subject: Integrate spam feature into call logs.

+ Add block and report spam actions.
+ Show spam icon and label for call log item.
+ Add stableIds for CallLogAdapter to improve performance(reuse same
viewItem to minimize update work).
* Fix funky UI of call log.

Change-Id: I6144d70b6a8e38061e1447d0d01910d53026d1db
Fix: 27295728
Fix: 26907466
---
 res/layout/call_log_list_item_actions.xml | 59 ++++++++++++++++++++++++++++---
 1 file changed, 55 insertions(+), 4 deletions(-)

(limited to 'res/layout')

diff --git a/res/layout/call_log_list_item_actions.xml b/res/layout/call_log_list_item_actions.xml
index 78203b72d..4aad6195a 100644
--- a/res/layout/call_log_list_item_actions.xml
+++ b/res/layout/call_log_list_item_actions.xml
@@ -129,10 +129,61 @@
 
     </LinearLayout>
 
-    <ViewStub
-        android:id="@+id/extended_blocking_actions_container"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"/>
+    <LinearLayout
+        android:id="@+id/block_report_action"
+        style="@style/CallLogActionStyle"
+        android:visibility="gone">
+
+        <ImageView
+            style="@style/CallLogActionIconStyle"
+            android:src="@drawable/ic_block_24dp"/>
+
+        <TextView
+            style="@style/CallLogActionTextStyle"
+            android:text="@string/call_log_action_block_report_number" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/block_action"
+        style="@style/CallLogActionStyle"
+        android:visibility="gone">
+
+        <ImageView
+            style="@style/CallLogActionIconStyle"
+            android:src="@drawable/ic_block_24dp"/>
+
+        <TextView
+            style="@style/CallLogActionTextStyle"
+            android:text="@string/call_log_action_block_number" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/unblock_action"
+        style="@style/CallLogActionStyle"
+        android:visibility="gone">
+
+        <ImageView
+            style="@style/CallLogActionIconStyle"
+            android:src="@drawable/ic_unblock"/>
+
+        <TextView
+            style="@style/CallLogActionTextStyle"
+            android:text="@string/call_log_action_unblock_number" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/report_not_spam_action"
+        style="@style/CallLogActionStyle"
+        android:visibility="gone">
+
+        <ImageView
+            style="@style/CallLogActionIconStyle"
+            android:src="@drawable/ic_unblock"/>
+
+        <TextView
+            style="@style/CallLogActionTextStyle"
+            android:text="@string/call_log_action_remove_spam" />
+    </LinearLayout>
 
     <LinearLayout
         android:id="@+id/details_action"
-- 
cgit v1.2.3