diff options
| author | Nancy Chen <nancychen@google.com> | 2014-08-15 22:59:34 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-08-15 22:59:34 +0000 |
| commit | 7d29a6f94e809e9f3a50d129445de31ed01dcb99 (patch) | |
| tree | 1799e9a33b1e5212274a22fb0057642305300d7b | |
| parent | 4069b050f1fbdba99b72474fae0d83c7cb243488 (diff) | |
| parent | d10beab01c423061710909537597df44fc25c458 (diff) | |
am d10beab0: Merge "Pushed the search result contact text to the right and removed extra dimens." into lmp-dev
* commit 'd10beab01c423061710909537597df44fc25c458':
Pushed the search result contact text to the right and removed extra dimens.
| -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> |