summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorTony Wickham <twickham@google.com>2015-10-09 01:40:31 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-10-09 01:40:31 +0000
commitfa3c369cc30345e23b2b90415a3348490dd2a0b2 (patch)
tree778e077115de160b16a2ea3401e8da3f7ae2dc0d /res
parentd70a4b7b7805f0fd61cb34487b4f6cc620025723 (diff)
parent37860923619b1e467975a74764dff03ab657bdc7 (diff)
downloadandroid_packages_apps_Trebuchet-fa3c369cc30345e23b2b90415a3348490dd2a0b2.tar.gz
android_packages_apps_Trebuchet-fa3c369cc30345e23b2b90415a3348490dd2a0b2.tar.bz2
android_packages_apps_Trebuchet-fa3c369cc30345e23b2b90415a3348490dd2a0b2.zip
am 37860923: Merge "Added launcher callback to specify search bar height." into ub-launcher3-burnaby
* commit '37860923619b1e467975a74764dff03ab657bdc7': Added launcher callback to specify search bar height.
Diffstat (limited to 'res')
-rw-r--r--res/values/dimens.xml3
1 files changed, 3 insertions, 0 deletions
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 28ede6785..5d690128a 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -21,6 +21,9 @@
<dimen name="dynamic_grid_edge_margin">6dp</dimen>
<dimen name="dynamic_grid_search_bar_max_width">500dp</dimen>
<dimen name="dynamic_grid_search_bar_height">56dp</dimen>
+ <!-- We want 32dp extra for the tall search bar, but 10dp comes from unwanted padding between
+ the search bar and workspace. -->
+ <dimen name="dynamic_grid_search_bar_height_tall">78dp</dimen>
<dimen name="dynamic_grid_page_indicator_height">20dp</dimen>
<dimen name="dynamic_grid_icon_drawable_padding">4dp</dimen>
<dimen name="dynamic_grid_workspace_page_spacing">8dp</dimen>