resolved conflict for merge of 70b7b60e to master
Change-Id: Iee5265256664f483ee94e350271f224cb13e72ee
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 4a6ec83..db0dde5 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -109,7 +109,9 @@
<dimen name="search_box_left_padding">8dp</dimen>
<!-- Search box interior padding - right -->
<dimen name="search_box_right_padding">8dp</dimen>
- <dimen name="search_box_search_icon_padding">4dp</dimen>
+ <!-- Padding around the icon in the search box. -->
+ <dimen name="search_box_icon_margin">4dp</dimen>
+ <dimen name="search_box_search_icon_padding">2dp</dimen>
<dimen name="search_box_collapsed_text_margin_left">24dp</dimen>
<dimen name="search_box_expanded_text_margin_left">26dp</dimen>
<!-- Size of the icon (voice search, close search) in the search box. -->