summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorAdam Cohen <adamcohen@google.com>2012-06-18 11:56:01 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-06-18 11:56:01 -0700
commit11ef746c5b20dc5be271435e8d2807a8bc22738e (patch)
tree8b39eab24102501e3a0c4f56095cd636b2fc1f81 /res
parentfaecda4f287ab7ffd72108fe364217bd5f100d71 (diff)
parent8ef6618d5e767441846f8865c812e8ff6e961ef2 (diff)
downloadandroid_packages_apps_Trebuchet-11ef746c5b20dc5be271435e8d2807a8bc22738e.tar.gz
android_packages_apps_Trebuchet-11ef746c5b20dc5be271435e8d2807a8bc22738e.tar.bz2
android_packages_apps_Trebuchet-11ef746c5b20dc5be271435e8d2807a8bc22738e.zip
am 8ef6618d: am a71d745a: Merge "Address widget size callback issue for small phones (issue 6670346)" into jb-dev
* commit '8ef6618d5e767441846f8865c812e8ff6e961ef2': Address widget size callback issue for small phones (issue 6670346)
Diffstat (limited to 'res')
-rw-r--r--res/values-sw340dp/dimens.xml6
-rw-r--r--res/values/dimens.xml8
2 files changed, 4 insertions, 10 deletions
diff --git a/res/values-sw340dp/dimens.xml b/res/values-sw340dp/dimens.xml
index 42fbb47ce..93de009db 100644
--- a/res/values-sw340dp/dimens.xml
+++ b/res/values-sw340dp/dimens.xml
@@ -39,10 +39,4 @@
<dimen name="cell_layout_top_padding_land">8dp</dimen>
<dimen name="cell_layout_bottom_padding_port">8dp</dimen>
<dimen name="cell_layout_bottom_padding_land">8dp</dimen>
-
-<!-- Workspace cell size -->
- <dimen name="workspace_width_gap_land">0dp</dimen>
- <dimen name="workspace_width_gap_port">0dp</dimen>
- <dimen name="workspace_height_gap_land">0dp</dimen>
- <dimen name="workspace_height_gap_port">0dp</dimen>
</resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 274c72f2a..f15d3d89b 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -150,8 +150,8 @@
<dimen name="workspace_cell_width_port">80dp</dimen>
<dimen name="workspace_cell_height_land">74dp</dimen>
<dimen name="workspace_cell_height_port">100dp</dimen>
- <dimen name="workspace_width_gap_land">-1dp</dimen>
- <dimen name="workspace_width_gap_port">-1dp</dimen>
- <dimen name="workspace_height_gap_land">-1dp</dimen>
- <dimen name="workspace_height_gap_port">-1dp</dimen>
+ <dimen name="workspace_width_gap_land">0dp</dimen>
+ <dimen name="workspace_width_gap_port">0dp</dimen>
+ <dimen name="workspace_height_gap_land">0dp</dimen>
+ <dimen name="workspace_height_gap_port">0dp</dimen>
</resources>