diff options
| author | Michael Jurka <mikejurka@google.com> | 2011-01-25 18:37:38 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-01-25 18:37:38 -0800 |
| commit | c6d775770e279a0e90020d0df0a834990af05377 (patch) | |
| tree | 824cec5644fc8d0c62e2b2553b7d45de7ae4015d /src/com/android | |
| parent | 3af863ba31e293e577c05537c9b8f7dc850a5e56 (diff) | |
| parent | 8b1fe774c24854fdefc4d875d8460752048696e2 (diff) | |
| download | packages_apps_trebuchet-c6d775770e279a0e90020d0df0a834990af05377.zip packages_apps_trebuchet-c6d775770e279a0e90020d0df0a834990af05377.tar.gz packages_apps_trebuchet-c6d775770e279a0e90020d0df0a834990af05377.tar.bz2 | |
Merge "Fix 3385181: Widget doesn't stay where I put it" into honeycomb
Diffstat (limited to 'src/com/android')
| -rw-r--r-- | src/com/android/launcher2/Launcher.java | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java index dabc42a..1a7067e 100644 --- a/src/com/android/launcher2/Launcher.java +++ b/src/com/android/launcher2/Launcher.java @@ -1148,10 +1148,7 @@ public final class Launcher extends Activity final int[] cellXY = mTmpAddItemCellCoordinates; final CellLayout layout = (CellLayout) mWorkspace.getChildAt(screen); - int[] touchXY = null; - if (mAddDropPosition != null && mAddDropPosition[0] > -1 && mAddDropPosition[1] > -1) { - touchXY = mAddDropPosition; - } + int[] touchXY = mAddDropPosition; boolean foundCellSpan = false; if (touchXY != null) { // when dragging and dropping, just find the closest free spot @@ -1196,13 +1193,7 @@ public final class Launcher extends Activity // if we are placing widgets on a "spring-loaded" screen final int[] cellXY = mTmpAddItemCellCoordinates; - // For now, we don't save the coordinate where we dropped the icon because we're not - // supporting spring-loaded mini-screens; however, leaving the ability to directly place - // a widget on the home screen in case we want to add it in the future - int[] touchXY = null; - if (mAddDropPosition != null && mAddDropPosition[0] > -1 && mAddDropPosition[1] > -1) { - touchXY = mAddDropPosition; - } + int[] touchXY = mAddDropPosition; boolean foundCellSpan = false; if (touchXY != null) { // when dragging and dropping, just find the closest free spot |