am 6edbe421: Merge "Add "add to contacts" actionable item to shortcut card." into lmp-dev

* commit '6edbe4218eea793f7de8e5dfe2b3b548727a5df1':
  Add "add to contacts" actionable item to shortcut card.

2 files changed, 43 insertions, 35 deletions

diff --git a/res/layout/call_log_list_item_extra.xml b/res/layout/call_log_list_item_extra.xml
index 3623e3f94..c4126e42f 100644
--- a/res/layout/call_log_list_item_extra.xml
+++ b/res/layout/call_log_list_item_extra.xml
@@ -18,45 +18,50 @@
 
 <!-- Can't use merge here because this is referenced via a ViewStub -->
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-             android:layout_width="match_parent"
-             android:layout_height="wrap_content"
-             android:id="@+id/badge_container">
+    android:id="@+id/badge_container"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
 
     <View android:layout_width="match_parent"
-          android:layout_height="1px"
-          android:background="@color/favorite_contacts_separator_color"/>
+        android:layout_height="1px"
+        android:background="@color/favorite_contacts_separator_color" />
 
     <LinearLayout android:id="@+id/badge_link_container"
-                  android:layout_width="match_parent"
-                  android:layout_height="wrap_content"
-                  android:paddingStart="@dimen/call_log_outer_margin"
-                  android:paddingEnd="@dimen/call_log_outer_margin"
-                  android:paddingTop="0dip"
-                  android:paddingBottom="0dip"
-                  android:background="?android:attr/selectableItemBackground"
-                  android:clickable="true">
-        <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"
-                  android:layout_weight="1"/>
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingStart="@dimen/call_log_outer_margin"
+        android:paddingEnd="@dimen/call_log_outer_margin"
+        android:paddingTop="@dimen/call_log_item_extra_padding_vertical"
+        android:paddingBottom="@dimen/call_log_item_extra_padding_vertical"
+        android:background="?android:attr/selectableItemBackground"
+        android:clickable="true">
+
+        <ImageView android:id="@+id/badge_image"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:tint="@color/dialpad_primary_text_color"
+            android:padding="@dimen/call_log_outer_margin" />
+
+        <TextView android:id="@+id/badge_text"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:paddingStart="@dimen/call_log_start_margin"
+            android:textColor="@color/dialpad_primary_text_color"
+            android:layout_gravity="center_vertical"
+            android:layout_weight="1" />
+
         <ImageView android:id="@+id/dismiss_button"
-                   android:layout_width="wrap_content"
-                   android:layout_height="wrap_content"
-                   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"/>
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            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" />
+
     </LinearLayout>
+
 </FrameLayout>
\ No newline at end of file
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 0856032b2..e48720edd 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -76,6 +76,9 @@
     <dimen name="recent_call_log_item_padding_top">12dp</dimen>
     <dimen name="recent_call_log_item_padding_bottom">11dp</dimen>
 
+    <dimen name="call_log_item_extra_padding_vertical">4dp</dimen>
+
+
     <!-- Size of the star icon on the favorites tile. -->
     <dimen name="favorites_star_icon_size">12dp</dimen>