summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Cohen <adamcohen@google.com>2011-06-13 19:05:41 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-06-13 19:05:41 -0700
commitbf8bee70c2399bdd718f1b2604c8f3c156895cfc (patch)
treee1dd4db6a7a14a49c82dae29d6597b4f550fca72
parentbfbfd26c627a18f8e1e3e6d0e53e78feab360203 (diff)
parent37b59ff9aa601d75392341e45d61bbb5c408439f (diff)
downloadandroid_packages_apps_Trebuchet-bf8bee70c2399bdd718f1b2604c8f3c156895cfc.tar.gz
android_packages_apps_Trebuchet-bf8bee70c2399bdd718f1b2604c8f3c156895cfc.tar.bz2
android_packages_apps_Trebuchet-bf8bee70c2399bdd718f1b2604c8f3c156895cfc.zip
Merge "Tightening up the widget resize frame to account for widget padding"
-rw-r--r--src/com/android/launcher2/AppWidgetResizeFrame.java23
1 files changed, 19 insertions, 4 deletions
diff --git a/src/com/android/launcher2/AppWidgetResizeFrame.java b/src/com/android/launcher2/AppWidgetResizeFrame.java
index 4390c595e..eca5ad7c4 100644
--- a/src/com/android/launcher2/AppWidgetResizeFrame.java
+++ b/src/com/android/launcher2/AppWidgetResizeFrame.java
@@ -7,6 +7,7 @@ import android.animation.ValueAnimator;
import android.animation.ValueAnimator.AnimatorUpdateListener;
import android.appwidget.AppWidgetProviderInfo;
import android.content.Context;
+import android.content.res.Resources;
import android.view.Gravity;
import android.widget.FrameLayout;
import android.widget.ImageView;
@@ -30,6 +31,11 @@ public class AppWidgetResizeFrame extends FrameLayout {
private boolean mTopBorderActive;
private boolean mBottomBorderActive;
+ private int mWidgetPaddingLeft;
+ private int mWidgetPaddingRight;
+ private int mWidgetPaddingTop;
+ private int mWidgetPaddingBottom;
+
private int mBaselineWidth;
private int mBaselineHeight;
private int mBaselineX;
@@ -103,6 +109,12 @@ 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);
+
if (mResizeMode == AppWidgetProviderInfo.RESIZE_HORIZONTAL) {
mTopHandle.setVisibility(GONE);
mBottomHandle.setVisibility(GONE);
@@ -294,10 +306,13 @@ public class AppWidgetResizeFrame extends FrameLayout {
int xOffset = mCellLayout.getLeft() + mCellLayout.getLeftPadding() - mWorkspace.getScrollX();
int yOffset = mCellLayout.getTop() + mCellLayout.getTopPadding() - mWorkspace.getScrollY();
- int newWidth = mWidgetView.getWidth() + 2 * mBackgroundPadding;
- int newHeight = mWidgetView.getHeight() + 2 * mBackgroundPadding;
- int newX = mWidgetView.getLeft() - mBackgroundPadding + xOffset;
- int newY = mWidgetView.getTop() - mBackgroundPadding + yOffset;
+ int newWidth = mWidgetView.getWidth() + 2 * mBackgroundPadding - mWidgetPaddingLeft -
+ mWidgetPaddingRight;
+ int newHeight = mWidgetView.getHeight() + 2 * mBackgroundPadding - mWidgetPaddingTop -
+ mWidgetPaddingBottom;
+
+ int newX = mWidgetView.getLeft() - mBackgroundPadding + xOffset + mWidgetPaddingLeft;
+ int newY = mWidgetView.getTop() - mBackgroundPadding + yOffset + mWidgetPaddingTop;
// We need to make sure the frame stays within the bounds of the CellLayout
if (newY < 0) {