commit df1e4e868a1970b756486dadd652651d40276d36
author Adam Cohen <adamcohen@google.com> Fri Jun 24 15:57:39 2011 -0700
committer Adam Cohen <adamcohen@google.com> Fri Jun 24 15:58:01 2011 -0700
tree 896cc257dc813d709de6eae2212dd6faee0d4575
parent d63cfa96814fa1a51490950b8df9853eef305cbb

Keeping folders synced when applications are uninstalled

-> fix bug 4905712

Change-Id: I4a250fd134e6d03bae30cfde6b33a82ed6f5fcef

src/com/android/launcher2/Folder.java

diff --git a/src/com/android/launcher2/Folder.java b/src/com/android/launcher2/Folder.java
index 60c7ed4..0454430 100644
--- a/src/com/android/launcher2/Folder.java
+++ b/src/com/android/launcher2/Folder.java
@@ -76,7 +76,6 @@
     private final LayoutInflater mInflater;
     private final IconCache mIconCache;
     private int mState = STATE_NONE;
-    private int[] mDragItemPosition = new int[2];
     private static final int FULL_GROW = 0;
     private static final int PARTIAL_GROW = 1;
     private static final int REORDER_ANIMATION_DURATION = 230;
@@ -213,8 +212,6 @@
 
             mLauncher.getWorkspace().onDragStartedWithItem(v);
             mDragController.startDrag(v, this, item, DragController.DRAG_ACTION_COPY);
-            mDragItemPosition[0] = item.cellX;
-            mDragItemPosition[1] = item.cellY;
             mIconDrawable = ((TextView) v).getCompoundDrawables()[1];
 
             mCurrentDragInfo = item;
@@ -865,7 +862,7 @@
     public void onRemove(ShortcutInfo item) {
         mItemsInvalidated = true;
         if (item == mCurrentDragInfo) return;
-        View v = mContent.getChildAt(mDragItemPosition[0], mDragItemPosition[1]);
+        View v = getViewForInfo(item);
         mContent.removeView(v);
         if (mState == STATE_ANIMATING) {
             mRearrangeOnClose = true;
@@ -877,6 +874,18 @@
         }
     }
 
+    private View getViewForInfo(ShortcutInfo item) {
+        for (int j = 0; j < mContent.getCountY(); j++) {
+            for (int i = 0; i < mContent.getCountX(); i++) {
+                View v = mContent.getChildAt(i, j);
+                if (v.getTag() == item) {
+                    return v;
+                }
+            }
+        }
+        return null;
+    }
+
     public void onItemsChanged() {
     }
     public void onTitleChanged(CharSequence title) {