From e4b7729b9d6343b4e7e0905e117e5ac469727cbe Mon Sep 17 00:00:00 2001 From: Adam Cohen Date: Tue, 8 Mar 2011 18:35:52 -0800 Subject: Small UI tweaks to widget resizing Change-Id: I4d6f81ce17b3f3406206e8d25317c05cb9f8b5c4 --- src/com/android/launcher2/AppWidgetResizeFrame.java | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) (limited to 'src/com/android') diff --git a/src/com/android/launcher2/AppWidgetResizeFrame.java b/src/com/android/launcher2/AppWidgetResizeFrame.java index 5f725b7ba..2b2662f42 100644 --- a/src/com/android/launcher2/AppWidgetResizeFrame.java +++ b/src/com/android/launcher2/AppWidgetResizeFrame.java @@ -48,7 +48,8 @@ public class AppWidgetResizeFrame extends FrameLayout { final int SNAP_DURATION = 150; final int BACKGROUND_PADDING = 24; - final float DIMMED_HANDLE_ALPHA = 0.3f; + final float DIMMED_HANDLE_ALPHA = 0f; + final float RESIZE_THRESHOLD = 0.66f; public static final int LEFT = 0; public static final int TOP = 1; @@ -193,11 +194,21 @@ public class AppWidgetResizeFrame extends FrameLayout { int xThreshold = mCellLayout.getCellWidth() + mCellLayout.getWidthGap(); int yThreshold = mCellLayout.getCellHeight() + mCellLayout.getHeightGap(); - int hSpanInc = (int) Math.round(1.0f * mDeltaX / xThreshold) - mRunningHInc; - int vSpanInc = (int) Math.round(1.0f * mDeltaY / yThreshold) - mRunningVInc; + float hSpanIncF = 1.0f * mDeltaX / xThreshold - mRunningHInc; + float vSpanIncF = 1.0f * mDeltaY / yThreshold - mRunningVInc; + + int hSpanInc = 0; + int vSpanInc = 0; int cellXInc = 0; int cellYInc = 0; + if (Math.abs(hSpanIncF) > RESIZE_THRESHOLD) { + hSpanInc = Math.round(hSpanIncF); + } + if (Math.abs(vSpanIncF) > RESIZE_THRESHOLD) { + vSpanInc = Math.round(vSpanIncF); + } + if (hSpanInc == 0 && vSpanInc == 0) return; // Before we change the widget, we clear the occupied cells associated with it. -- cgit v1.2.3