Update margins around directory headers and search bar icons.

*Added more space to the top of the directory header
*Added more margin to the left of the back arrow and right of the close
*Pushed the contact text to the right

Bug: 15596340
Change-Id: I8817369d52faeb8edff7817b3f29726c1717e74f
diff --git a/res-common/layout/search_bar_expanded.xml b/res-common/layout/search_bar_expanded.xml
index caa4715..3c71b50 100644
--- a/res-common/layout/search_bar_expanded.xml
+++ b/res-common/layout/search_bar_expanded.xml
@@ -26,7 +26,7 @@
         android:id="@+id/search_back_button"
         android:layout_width="@dimen/search_box_icon_size"
         android:layout_height="@dimen/search_box_icon_size"
-        android:layout_margin="@dimen/search_box_icon_margin"
+        android:layout_margin="@dimen/search_box_navigation_icon_margin"
         android:src="@drawable/ic_back_arrow"
         android:background="?android:attr/selectableItemBackgroundBorderless"
         android:contentDescription="@string/action_menu_back_from_search"
@@ -50,9 +50,9 @@
 
     <ImageView
         android:id="@+id/search_close_button"
-        android:layout_height="@dimen/search_box_icon_size"
-        android:layout_width="@dimen/search_box_icon_size"
-        android:layout_margin="@dimen/search_box_icon_margin"
+        android:layout_height="@dimen/search_box_close_icon_size"
+        android:layout_width="@dimen/search_box_close_icon_size"
+        android:layout_margin="@dimen/search_box_close_icon_margin"
         android:src="@drawable/ic_close_dk"
         android:clickable="true"
         android:background="?android:attr/selectableItemBackgroundBorderless"