diff options
| author | Nancy Chen <nancychen@google.com> | 2014-08-16 00:44:38 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-08-16 00:44:38 +0000 |
| commit | 00cd25e1b967a0ed334a98f7a895ef8072c9f4cc (patch) | |
| tree | 779632923445dd7d4683f40bd7bcc2736054f046 /res | |
| parent | 905f66806672b229dc270d0c56f435da28dfca9c (diff) | |
| parent | 7cd080dc810cca96fb91999e2ee26834e451ae2b (diff) | |
am 7cd080dc: am 7d29a6f9: am d10beab0: Merge "Pushed the search result contact text to the right and removed extra dimens." into lmp-dev
* commit '7cd080dc810cca96fb91999e2ee26834e451ae2b':
Pushed the search result contact text to the right and removed extra dimens.
Diffstat (limited to 'res')
| -rw-r--r-- | res/values/dimens.xml | 3 | ||||
| -rw-r--r-- | res/values/styles.xml | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/res/values/dimens.xml b/res/values/dimens.xml index cba04bdbf..0856032b2 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -108,9 +108,6 @@ <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">22dp</dimen> - <dimen name="search_box_expanded_text_margin_left">26dp</dimen> - <!-- Size of the icon (voice search, close search) in the search box. --> - <dimen name="search_box_icon_size">28dp</dimen> <dimen name="search_list_padding_top">16dp</dimen> <dimen name="search_box_elevation">3dp</dimen> diff --git a/res/values/styles.xml b/res/values/styles.xml index a3ef1c630..d0836a51f 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -36,7 +36,9 @@ <item name="list_item_padding_right">32dp</item> <item name="list_item_padding_bottom">12dp</item> <item name="list_item_padding_left">16dp</item> - <item name="list_item_gap_between_image_and_text">8dip</item> + <item name="list_item_gap_between_image_and_text"> + @dimen/contact_browser_list_item_gap_between_image_and_text + </item> <item name="list_item_gap_between_label_and_data">5dip</item> <item name="list_item_presence_icon_margin">4dip</item> <item name="list_item_presence_icon_size">16dip</item> |