Automatically padding widgets based on target API level

Change-Id: I062c487df1067a787e9921e85558b38294a10112

1 files changed, 12 insertions, 7 deletions

diff --git a/src/com/android/launcher2/LauncherAppWidgetHostView.java b/src/com/android/launcher2/LauncherAppWidgetHostView.java
index 7c3b993ce..a84ced671 100644
--- a/src/com/android/launcher2/LauncherAppWidgetHostView.java
+++ b/src/com/android/launcher2/LauncherAppWidgetHostView.java
@@ -17,6 +17,7 @@
 package com.android.launcher2;
 
 import android.appwidget.AppWidgetHostView;
+import android.appwidget.AppWidgetProviderInfo;
 import android.content.Context;
 import android.content.res.Resources;
 import android.view.LayoutInflater;
@@ -26,6 +27,7 @@ import android.view.ViewConfiguration;
 import android.view.ViewGroup;
 
 import com.android.launcher.R;
+import com.android.launcher2.Launcher.Padding;
 
 /**
  * {@inheritDoc}
@@ -34,17 +36,12 @@ public class LauncherAppWidgetHostView extends AppWidgetHostView {
     private boolean mHasPerformedLongPress;
     private CheckForLongPress mPendingCheckForLongPress;
     private LayoutInflater mInflater;
+    private Launcher mLauncher;
 
     public LauncherAppWidgetHostView(Context context) {
         super(context);
         mInflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-
-        Resources r = context.getResources();
-        // We add necessary padding to the AppWidgetHostView
-        setPadding(r.getDimensionPixelSize(R.dimen.app_widget_padding_left),
-                r.getDimensionPixelSize(R.dimen.app_widget_padding_top),
-                r.getDimensionPixelSize(R.dimen.app_widget_padding_right),
-                r.getDimensionPixelSize(R.dimen.app_widget_padding_bottom));
+        mLauncher = (Launcher) context;
     }
 
     @Override
@@ -119,6 +116,14 @@ public class LauncherAppWidgetHostView extends AppWidgetHostView {
     }
 
     @Override
+    public void setAppWidget(int appWidgetId, AppWidgetProviderInfo info) {
+        super.setAppWidget(appWidgetId, info);
+        // We add necessary padding to the AppWidgetHostView
+        Launcher.Padding padding = mLauncher.getPaddingForWidget(info);
+        setPadding(padding.left, padding.top, padding.right, padding.bottom);
+    }
+
+    @Override
     public int getDescendantFocusability() {
         return ViewGroup.FOCUS_BLOCK_DESCENDANTS;
     }