Adding transitions after reorder within folder
Change-Id: I52b20fa1b2e4f9ee0b4a68ac703b95a2050dbd4a
diff --git a/src/com/android/launcher2/CellLayout.java b/src/com/android/launcher2/CellLayout.java
index 68e9edb..99d62ae 100644
--- a/src/com/android/launcher2/CellLayout.java
+++ b/src/com/android/launcher2/CellLayout.java
@@ -153,7 +153,6 @@
mWidthGap = a.getDimensionPixelSize(R.styleable.CellLayout_widthGap, 0);
mHeightGap = a.getDimensionPixelSize(R.styleable.CellLayout_heightGap, 0);
mMaxGap = a.getDimensionPixelSize(R.styleable.CellLayout_maxGap, 0);
-
mCountX = LauncherModel.getCellCountX();
mCountY = LauncherModel.getCellCountY();
mOccupied = new boolean[mCountX][mCountY];
@@ -1384,13 +1383,11 @@
*
* @param child The child that is being dropped
*/
- void onDropChild(View child, boolean animate) {
+ void onDropChild(View child) {
if (child != null) {
LayoutParams lp = (LayoutParams) child.getLayoutParams();
lp.isDragging = false;
lp.dropped = true;
- lp.animateDrop = animate;
- child.setVisibility(animate ? View.INVISIBLE : View.VISIBLE);
child.requestLayout();
}
}
@@ -1717,22 +1714,8 @@
@ViewDebug.ExportedProperty
int y;
- /**
- * The old X coordinate of this item, relative to its current parent.
- * Used to animate the item into its new position.
- */
- int oldX;
-
- /**
- * The old Y coordinate of this item, relative to its current parent.
- * Used to animate the item into its new position.
- */
- int oldY;
-
boolean dropped;
- boolean animateDrop;
-
public LayoutParams(Context c, AttributeSet attrs) {
super(c, attrs);
cellHSpan = 1;