diff options
author | Adam Cohen <adamcohen@google.com> | 2011-09-30 19:26:20 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-09-30 19:26:20 -0700 |
commit | 45d0370b6cb9c71f68c1f3555bd835b8e9d92d71 (patch) | |
tree | 32ded0d2dc1e323fc93344fe6c63adc17db45f7e | |
parent | f138855ccf9cd7cb388c0a6e84b04ece1f7b18ea (diff) | |
parent | 82ebbd2a2f9ae5cb0a9d47f2f3a4293e4d0292d7 (diff) | |
download | android_packages_apps_Trebuchet-45d0370b6cb9c71f68c1f3555bd835b8e9d92d71.tar.gz android_packages_apps_Trebuchet-45d0370b6cb9c71f68c1f3555bd835b8e9d92d71.tar.bz2 android_packages_apps_Trebuchet-45d0370b6cb9c71f68c1f3555bd835b8e9d92d71.zip |
Merge "Removing auto-padding of widgets, as it is now done at framework level"
-rw-r--r-- | src/com/android/launcher2/AppWidgetResizeFrame.java | 10 | ||||
-rw-r--r-- | src/com/android/launcher2/Launcher.java | 16 | ||||
-rw-r--r-- | src/com/android/launcher2/LauncherAppWidgetHostView.java | 12 |
3 files changed, 16 insertions, 22 deletions
diff --git a/src/com/android/launcher2/AppWidgetResizeFrame.java b/src/com/android/launcher2/AppWidgetResizeFrame.java index 476219374..b7943eccc 100644 --- a/src/com/android/launcher2/AppWidgetResizeFrame.java +++ b/src/com/android/launcher2/AppWidgetResizeFrame.java @@ -111,11 +111,11 @@ public class AppWidgetResizeFrame extends FrameLayout { Gravity.CENTER_HORIZONTAL | Gravity.BOTTOM); addView(mBottomHandle, lp); - Resources r = context.getResources(); - mWidgetPaddingLeft = r.getDimensionPixelSize(R.dimen.app_widget_padding_left); - mWidgetPaddingTop = r.getDimensionPixelSize(R.dimen.app_widget_padding_top); - mWidgetPaddingRight = r.getDimensionPixelSize(R.dimen.app_widget_padding_right); - mWidgetPaddingBottom = r.getDimensionPixelSize(R.dimen.app_widget_padding_bottom); + Launcher.Padding p = mLauncher.getPaddingForWidget(widgetView.getAppWidgetInfo().provider); + mWidgetPaddingLeft = p.left; + mWidgetPaddingTop = p.top; + mWidgetPaddingRight = p.right; + mWidgetPaddingBottom = p.bottom; if (mResizeMode == AppWidgetProviderInfo.RESIZE_HORIZONTAL) { mTopHandle.setVisibility(GONE); diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java index 02fccc590..83bce6db7 100644 --- a/src/com/android/launcher2/Launcher.java +++ b/src/com/android/launcher2/Launcher.java @@ -75,9 +75,9 @@ import android.view.MenuItem; import android.view.MotionEvent; import android.view.Surface; import android.view.View; -import android.view.View.OnLongClickListener; import android.view.ViewGroup; import android.view.WindowManager; +import android.view.View.OnLongClickListener; import android.view.accessibility.AccessibilityEvent; import android.view.animation.AccelerateDecelerateInterpolator; import android.view.animation.AccelerateInterpolator; @@ -876,10 +876,16 @@ public final class Launcher extends Activity 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); - p.top = r.getDimensionPixelSize(R.dimen.app_widget_padding_top); - p.bottom = r.getDimensionPixelSize(R.dimen.app_widget_padding_bottom); + // The default padding values are private API currently, but will be added in + // API level 15. The current values are (8, 8, 8, 8). + p.left = r.getDimensionPixelSize(com.android.internal. + R.dimen.default_app_widget_padding_left); + p.right = r.getDimensionPixelSize(com.android.internal. + R.dimen.default_app_widget_padding_right); + p.top = r.getDimensionPixelSize(com.android.internal. + R.dimen.default_app_widget_padding_top); + p.bottom = r.getDimensionPixelSize(com.android.internal. + R.dimen.default_app_widget_padding_bottom); } return p; diff --git a/src/com/android/launcher2/LauncherAppWidgetHostView.java b/src/com/android/launcher2/LauncherAppWidgetHostView.java index 791711893..1a4a45e5e 100644 --- a/src/com/android/launcher2/LauncherAppWidgetHostView.java +++ b/src/com/android/launcher2/LauncherAppWidgetHostView.java @@ -116,18 +116,6 @@ public class LauncherAppWidgetHostView extends AppWidgetHostView { } @Override - public void setAppWidget(int appWidgetId, AppWidgetProviderInfo info) { - super.setAppWidget(appWidgetId, info); - // Sometimes the AppWidgetManager returns a null AppWidgetProviderInfo object for - // a widget, eg. for some widgets in safe mode. - if (info != null) { - // We add necessary padding to the AppWidgetHostView - Launcher.Padding padding = mLauncher.getPaddingForWidget(info.provider); - setPadding(padding.left, padding.top, padding.right, padding.bottom); - } - } - - @Override public int getDescendantFocusability() { return ViewGroup.FOCUS_BLOCK_DESCENDANTS; } |