summaryrefslogtreecommitdiffstats
path: root/res/values
diff options
context:
space:
mode:
authorAdam Cohen <adamcohen@google.com>2013-10-31 21:35:51 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-10-31 21:35:51 +0000
commitfc6175df7d2f82e13a27bb78170aec480a72d355 (patch)
tree18b10d03d18157b6ef643c4d1a5ec9e2896daa01 /res/values
parent49ac59cbb3ca0d2d948992c90c19be7cd7f096f7 (diff)
parent3b185e2513bcc3318753c21d3909d8dab2291e31 (diff)
downloadandroid_packages_apps_Trebuchet-fc6175df7d2f82e13a27bb78170aec480a72d355.tar.gz
android_packages_apps_Trebuchet-fc6175df7d2f82e13a27bb78170aec480a72d355.tar.bz2
android_packages_apps_Trebuchet-fc6175df7d2f82e13a27bb78170aec480a72d355.zip
Merge "Fixing up PagedView to work in landscape mode" into jb-ub-now-jetsonic
Diffstat (limited to 'res/values')
-rw-r--r--res/values/attrs.xml3
-rw-r--r--res/values/dimens.xml2
2 files changed, 2 insertions, 3 deletions
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index a2d3a83e0..0006a7455 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -103,8 +103,7 @@
<attr name="pageLayoutPaddingBottom" format="dimension" />
<attr name="pageLayoutPaddingLeft" format="dimension" />
<attr name="pageLayoutPaddingRight" format="dimension" />
- <!-- The space between adjacent pages of the PagedView. -->
- <attr name="pageSpacing" format="dimension" />
+
<!-- The page indicator for this workspace -->
<attr name="pageIndicator" format="reference" />
</declare-styleable>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index dcddc09ad..d87fb1431 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -21,6 +21,7 @@
<dimen name="dynamic_grid_search_bar_height">48dp</dimen>
<dimen name="dynamic_grid_page_indicator_height">24dp</dimen>
<dimen name="dynamic_grid_icon_drawable_padding">4dp</dimen>
+ <dimen name="dynamic_grid_workspace_page_spacing">8dp</dimen>
<!-- Wallpaper picker -->
<dimen name="wallpaperThumbnailWidth">106.5dp</dimen>
@@ -41,7 +42,6 @@
<!-- Workspace -->
<dimen name="workspace_max_gap">16dp</dimen>
<dimen name="workspace_overscroll_drawable_padding">0dp</dimen>
- <dimen name="workspace_spring_loaded_page_spacing">15dp</dimen>
<dimen name="overview_panel_bottom_padding">50dp</dimen>
<dimen name="overview_panel_buttonSpacing">60dp</dimen>
<dimen name="overview_mode_page_offset">130dp</dimen>