summaryrefslogtreecommitdiffstats
path: root/res/values/dimens.xml
diff options
context:
space:
mode:
authorTony Wickham <twickham@google.com>2015-10-08 18:32:22 -0700
committerTony Wickham <twickham@google.com>2015-10-08 18:32:22 -0700
commit72c689a7a27d0bddf804fdfd1eb69c9bc1a901f7 (patch)
tree61ece8a33b15cee4c5d27e953453b25ba72901c3 /res/values/dimens.xml
parente2722996e87bd2a469b257e1927b12c4c793b0c0 (diff)
parentd70a4b7b7805f0fd61cb34487b4f6cc620025723 (diff)
downloadandroid_packages_apps_Trebuchet-72c689a7a27d0bddf804fdfd1eb69c9bc1a901f7.tar.gz
android_packages_apps_Trebuchet-72c689a7a27d0bddf804fdfd1eb69c9bc1a901f7.tar.bz2
android_packages_apps_Trebuchet-72c689a7a27d0bddf804fdfd1eb69c9bc1a901f7.zip
resolved conflicts for d70a4b7b to ub-launcher3-master
Change-Id: Ib04f80eeebf551fc026925830fc4739d1c620513
Diffstat (limited to 'res/values/dimens.xml')
-rw-r--r--res/values/dimens.xml1
1 files changed, 1 insertions, 0 deletions
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index e0cbd907e..0448f7ca3 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -58,6 +58,7 @@
<dimen name="container_fastscroll_popup_text_size">48dp</dimen>
<!-- All Apps -->
+ <dimen name="all_apps_button_scale_down">0dp</dimen>
<dimen name="all_apps_grid_view_start_margin">0dp</dimen>
<dimen name="all_apps_grid_section_y_offset">8dp</dimen>
<dimen name="all_apps_grid_section_text_size">24sp</dimen>