summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Cohen <adamcohen@google.com>2012-06-18 18:53:54 (GMT)
committerAndroid Git Automerger <android-git-automerger@android.com>2012-06-18 18:53:54 (GMT)
commit8ef6618d5e767441846f8865c812e8ff6e961ef2 (patch)
treed34db6803cf5a94cbd2792f65e5e8ce2aa9b2864
parentf43a32a06d673df3717f2d4ee331d8e2cad88020 (diff)
parenta71d745ab3449c29f86aa2da8e1848d6edf40dbe (diff)
downloadandroid_packages_apps_Trebuchet-8ef6618d5e767441846f8865c812e8ff6e961ef2.zip
android_packages_apps_Trebuchet-8ef6618d5e767441846f8865c812e8ff6e961ef2.tar.gz
android_packages_apps_Trebuchet-8ef6618d5e767441846f8865c812e8ff6e961ef2.tar.bz2
am a71d745a: Merge "Address widget size callback issue for small phones (issue 6670346)" into jb-dev
* commit 'a71d745ab3449c29f86aa2da8e1848d6edf40dbe': Address widget size callback issue for small phones (issue 6670346)
-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 42fbb47..93de009 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 274c72f..f15d3d8 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>