PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am c6d77577: Merge "Fix 3385181: Widget doesn\'t stay where I put it" into honeycomb

Browse Source 
* commit 'c6d775770e279a0e90020d0df0a834990af05377':
  Fix 3385181: Widget doesn't stay where I put it
This commit is contained in:
Michael Jurka
2011-01-25 18:39:17 -08:00
committed by Android Git Automerger
parent 76aa1c377c c6d775770e
commit 359e64d202
1 changed files with 2 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher2/Launcher.java
+2 -11
View File
@@ -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