diff options
| author | Adrian Roos <roosa@google.com> | 2014-06-11 12:35:06 +0200 |
|---|---|---|
| committer | Adrian Roos <roosa@google.com> | 2014-06-11 12:35:06 +0200 |
| commit | e42b8ca160db365adb3dd99a5792a778b12ca081 (patch) | |
| tree | fb5e01a46541af394a9d1ef85f1de48e84debec2 /res/values/dimens.xml | |
| parent | 623fc9920f2e675e4b961e73bbe848724ad1553f (diff) | |
| parent | 70b7b60eb490c2196f4db8095c24954e64664b2c (diff) | |
| download | android_packages_apps_Dialer-e42b8ca160db365adb3dd99a5792a778b12ca081.tar.gz android_packages_apps_Dialer-e42b8ca160db365adb3dd99a5792a778b12ca081.tar.bz2 android_packages_apps_Dialer-e42b8ca160db365adb3dd99a5792a778b12ca081.zip | |
resolved conflict for merge of 70b7b60e to master
Change-Id: Iee5265256664f483ee94e350271f224cb13e72ee
Diffstat (limited to 'res/values/dimens.xml')
| -rw-r--r-- | res/values/dimens.xml | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/res/values/dimens.xml b/res/values/dimens.xml index 4a6ec836e..db0dde545 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. --> |