diff options
| author | Hyunyoung Song <hyunyoungs@google.com> | 2015-07-23 21:24:37 -0700 |
|---|---|---|
| committer | Hyunyoung Song <hyunyoungs@google.com> | 2015-07-23 21:24:37 -0700 |
| commit | 0c0d54637af7109ae22e21a117dba3efdaded4b5 (patch) | |
| tree | fe9ed94353b09dda232fceb64691f96dcd5db8d3 /res/values-sw720dp/dimens.xml | |
| parent | cf51139c6e1d57b57177109f2177edc41edf5bbc (diff) | |
| parent | 13ef17a37e683b8ad5800e9f542b411180fbec2f (diff) | |
| download | android_packages_apps_Trebuchet-0c0d54637af7109ae22e21a117dba3efdaded4b5.tar.gz android_packages_apps_Trebuchet-0c0d54637af7109ae22e21a117dba3efdaded4b5.tar.bz2 android_packages_apps_Trebuchet-0c0d54637af7109ae22e21a117dba3efdaded4b5.zip | |
resolved conflicts for merge of 13ef17a3 to mnc-ub-dev
b/22609402
Change-Id: I80699d985088b9b79211284e710e8a6b8b90860b
Diffstat (limited to 'res/values-sw720dp/dimens.xml')
| -rw-r--r-- | res/values-sw720dp/dimens.xml | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/res/values-sw720dp/dimens.xml b/res/values-sw720dp/dimens.xml index 8be996474..d48f9eed0 100644 --- a/res/values-sw720dp/dimens.xml +++ b/res/values-sw720dp/dimens.xml @@ -15,17 +15,14 @@ --> <resources> - <dimen name="app_icon_size">72dp</dimen> +<!-- All Apps --> + <dimen name="all_apps_search_bar_height">54dp</dimen> + <dimen name="all_apps_icon_top_bottom_padding">14dp</dimen> <!-- QSB --> <dimen name="toolbar_button_vertical_padding">8dip</dimen> <dimen name="toolbar_button_horizontal_padding">8dip</dimen> - <!-- When dragging items on the workspace, the number of dps by which the position of - the drag view should be offset from the position of the original view. --> - <dimen name="dragViewOffsetX">0dp</dimen> - <dimen name="dragViewOffsetY">0dp</dimen> - <!-- Cling --> <dimen name="cling_migration_content_margin">96dp</dimen> <dimen name="cling_migration_content_width">320dp</dimen> |