commit 95f6cfe4c999e3fa802ef4862a7f78b8148a7788
author Nancy Chen <nancychen@google.com> Thu Aug 21 23:46:21 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Aug 21 23:46:21 2014 +0000
tree 50d81405c111a98b890c329dee212f9ea86fc7f7
parent 9241faa146d7a9dc65d439cfc9e2c48b1b058cef
parent 6fad34b5fd3edfe8a14c038a72195b69afd503ba

am 6fad34b5: Merge "Update UI for Caller ID by Google is enabled badge." into lmp-dev

* commit '6fad34b5fd3edfe8a14c038a72195b69afd503ba':
  Update UI for Caller ID by Google is enabled badge.

res/layout/call_log_list_item_extra.xml

diff --git a/res/layout/call_log_list_item_extra.xml b/res/layout/call_log_list_item_extra.xml
index fbf71f6..3623e3f 100644
--- a/res/layout/call_log_list_item_extra.xml
+++ b/res/layout/call_log_list_item_extra.xml
@@ -24,8 +24,6 @@
 
     <View android:layout_width="match_parent"
           android:layout_height="1px"
-          android:layout_marginStart="@dimen/call_log_outer_margin"
-          android:layout_marginEnd="@dimen/call_log_outer_margin"
           android:background="@color/favorite_contacts_separator_color"/>
 
     <LinearLayout android:id="@+id/badge_link_container"
@@ -40,9 +38,11 @@
         <ImageView android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
                    android:id="@+id/badge_image"
+                   android:tint="@color/dialpad_primary_text_color"
                    android:padding="@dimen/call_log_outer_margin"/>
         <TextView android:layout_width="wrap_content"
                   android:layout_height="wrap_content"
+                  android:paddingStart="@dimen/call_log_start_margin"
                   android:id="@+id/badge_text"
                   android:textColor="@color/dialpad_primary_text_color"
                   android:layout_gravity="center_vertical"
@@ -50,8 +50,11 @@
         <ImageView android:id="@+id/dismiss_button"
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
-                   android:paddingTop="8dip"
+                   android:layout_gravity="center_vertical"
+                   android:layout_marginEnd="@dimen/call_log_icon_margin"
                    android:src="@drawable/ic_close_dk"
+                   android:tint="@color/recent_call_log_item_phone_icon_tint"
+                   android:alpha="0.3"
                    android:background="?android:attr/selectableItemBackground"
                    android:visibility="gone"
                    android:contentDescription="@string/description_dismiss"/>