summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Cohen <adamcohen@google.com>2012-06-18 11:52:17 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-06-18 11:52:17 -0700
commita71d745ab3449c29f86aa2da8e1848d6edf40dbe (patch)
treed34db6803cf5a94cbd2792f65e5e8ce2aa9b2864
parent15254fc386975a8ce2e171de40efd6348d7f9fbb (diff)
parent251afe1b52b3f6f8d413499de24bd963989f1d01 (diff)
downloadandroid_packages_apps_Trebuchet-a71d745ab3449c29f86aa2da8e1848d6edf40dbe.tar.gz
android_packages_apps_Trebuchet-a71d745ab3449c29f86aa2da8e1848d6edf40dbe.tar.bz2
android_packages_apps_Trebuchet-a71d745ab3449c29f86aa2da8e1848d6edf40dbe.zip
Merge "Address widget size callback issue for small phones (issue 6670346)" into jb-dev
-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>