From ff648b5512d1af9f5863aa97677a7a3e108ad1dd Mon Sep 17 00:00:00 2001
From: Adam Cohen <adamcohen@google.com>
Date: Mon, 19 Sep 2011 11:57:30 -0700
Subject: Issue 5218087, HONEYCOMB_MR2 -> ICE_CREAM_SANDWICH for widget padding

-> Also moved a couple dimens to be consistent

Change-Id: I897e1fc0706b8dcc6f6c1efe719c97b6a3932407
---
 res/values-land/config.xml              | 4 ----
 res/values-land/dimens.xml              | 4 ++++
 src/com/android/launcher2/Launcher.java | 4 +---
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/res/values-land/config.xml b/res/values-land/config.xml
index cbc0a6eda..121bb0c14 100644
--- a/res/values-land/config.xml
+++ b/res/values-land/config.xml
@@ -20,8 +20,4 @@
     <bool name="config_useDropTargetDownTransition">false</bool>
     <!-- Whether or not to fade the side pages -->
     <bool name="config_workspaceFadeAdjacentScreens">false</bool>
-
-    <!-- Padding applied to AppWidgets -->
-    <dimen name="app_widget_padding_top">8dp</dimen>
-    <dimen name="app_widget_padding_bottom">8dp</dimen>
 </resources>
diff --git a/res/values-land/dimens.xml b/res/values-land/dimens.xml
index 353265003..4bb64f71d 100644
--- a/res/values-land/dimens.xml
+++ b/res/values-land/dimens.xml
@@ -67,6 +67,10 @@
     <integer name="apps_customize_cling_focused_x">2</integer>
     <integer name="apps_customize_cling_focused_y">1</integer>
 
+    <!-- Padding applied to AppWidgets -->
+    <dimen name="app_widget_padding_top">8dp</dimen>
+    <dimen name="app_widget_padding_bottom">8dp</dimen>
+
 <!-- Folders -->
     <!-- The size of the image which sits behind the preview of the folder contents -->
     <dimen name="folder_preview_size">58dp</dimen>
diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index 482f08630..318601d0b 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -874,9 +874,7 @@ public final class Launcher extends Activity
             return p;
         }
 
-        // TODO: This should be ICE_CREAM_SANDWICH, but since the unbundled apps
-        // may not have updated their targetSdkVersion yet, we've bumped it down for now.
-        if (appInfo.targetSdkVersion >= Build.VERSION_CODES.HONEYCOMB_MR2) {
+        if (appInfo.targetSdkVersion >= Build.VERSION_CODES.ICE_CREAM_SANDWICH) {
             Resources r = getResources();
             p.left = r.getDimensionPixelSize(R.dimen.app_widget_padding_left);
             p.right = r.getDimensionPixelSize(R.dimen.app_widget_padding_right);
-- 
cgit v1.2.3