From f549abc92a680f31b4b210705e03428aa0d7c040 Mon Sep 17 00:00:00 2001
From: Andrew Lee <anwlee@google.com>
Date: Mon, 12 Oct 2015 12:50:55 -0700
Subject: Show icons for call detail actions.

- Remove LinearLayouts and use drawableLeft instead.
+ Up block asset from 18dp to 24dp.

Bug: 24109819
Change-Id: I941520f1b90e6f819c7f94269e395d26c56f5734
---
 res/layout/call_detail_footer.xml | 57 +++++++++++----------------------------
 1 file changed, 16 insertions(+), 41 deletions(-)

(limited to 'res/layout')

diff --git a/res/layout/call_detail_footer.xml b/res/layout/call_detail_footer.xml
index 7e56c02c2..048f8031b 100644
--- a/res/layout/call_detail_footer.xml
+++ b/res/layout/call_detail_footer.xml
@@ -23,59 +23,34 @@
         android:layout_height="@dimen/divider_line_thickness"
         android:background="@color/call_log_action_divider" />
 
-    <LinearLayout android:id="@+id/call_detail_action_block"
+    <TextView android:id="@+id/call_detail_action_block"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:visibility="gone"
-        style="@style/CallDetailActionItemStyle">
-
-        <TextView android:id="@+id/call_detail_action_block_text"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/action_block_number" />
-
-    </LinearLayout>
+        android:text="@string/action_block_number"
+        android:drawableLeft="@drawable/ic_call_detail_block"
+        style="@style/CallDetailActionItemStyle" />
 
-    <LinearLayout android:id="@+id/call_detail_action_copy"
+    <TextView android:id="@+id/call_detail_action_copy"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        style="@style/CallDetailActionItemStyle">
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/action_copy_number_text" />
-
-    </LinearLayout>
+        android:text="@string/action_copy_number_text"
+        android:drawableLeft="@drawable/ic_call_detail_content_copy"
+        style="@style/CallDetailActionItemStyle" />
 
-    <LinearLayout android:id="@+id/call_detail_action_edit_before_call"
+    <TextView android:id="@+id/call_detail_action_edit_before_call"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="horizontal"
+        android:text="@string/action_edit_number_before_call"
+        android:drawableLeft="@drawable/ic_call_detail_edit"
         android:visibility="gone"
-        style="@style/CallDetailActionItemStyle">
+        style="@style/CallDetailActionItemStyle" />
 
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/action_edit_number_before_call" />
-
-    </LinearLayout>
-
-    <LinearLayout android:id="@+id/call_detail_action_report"
+    <TextView android:id="@+id/call_detail_action_report"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="horizontal"
+        android:text="@string/action_report_number"
+        android:drawableLeft="@drawable/ic_call_detail_report"
         android:visibility="gone"
-        style="@style/CallDetailActionItemStyle">
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/action_report_number" />
-
-    </LinearLayout>
+        style="@style/CallDetailActionItemStyle" />
 
 </LinearLayout>
-- 
cgit v1.2.3