diff options
author | Adam Cohen <adamcohen@google.com> | 2011-06-30 12:09:54 -0700 |
---|---|---|
committer | Adam Cohen <adamcohen@google.com> | 2011-06-30 13:53:30 -0700 |
commit | 716b51e030f9c6ed34af2b947760e46a280c65a6 (patch) | |
tree | b3e8bf705c61b8a8fca03bb9a9e5c07578f7d60e /src/com/android/launcher2/Folder.java | |
parent | 6a0f57dfafced837a2a282d8feec28d5418be3b9 (diff) | |
download | android_packages_apps_Trebuchet-716b51e030f9c6ed34af2b947760e46a280c65a6.tar.gz android_packages_apps_Trebuchet-716b51e030f9c6ed34af2b947760e46a280c65a6.tar.bz2 android_packages_apps_Trebuchet-716b51e030f9c6ed34af2b947760e46a280c65a6.zip |
Adding transitions after reorder within folder
Change-Id: I52b20fa1b2e4f9ee0b4a68ac703b95a2050dbd4a
Diffstat (limited to 'src/com/android/launcher2/Folder.java')
-rw-r--r-- | src/com/android/launcher2/Folder.java | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/src/com/android/launcher2/Folder.java b/src/com/android/launcher2/Folder.java index da859cb8e..aebfcb533 100644 --- a/src/com/android/launcher2/Folder.java +++ b/src/com/android/launcher2/Folder.java @@ -224,12 +224,16 @@ public class Folder extends LinearLayout implements DragSource, OnItemLongClickL mEmptyCell[0] = item.cellX; mEmptyCell[1] = item.cellY; mCurrentDragView = v; - mContent.removeView(mCurrentDragView); - mInfo.remove(item); + } return true; } + public void onDragViewVisible() { + mContent.removeView(mCurrentDragView); + mInfo.remove(mCurrentDragInfo); + } + public boolean isEditingName() { return mIsEditingName; } @@ -294,9 +298,6 @@ public class Folder extends LinearLayout implements DragSource, OnItemLongClickL mDragController = dragController; } - public void onDragViewVisible() { - } - void setLauncher(Launcher launcher) { mLauncher = launcher; } @@ -542,7 +543,6 @@ public class Folder extends LinearLayout implements DragSource, OnItemLongClickL public void onDragEnter(DragObject d) { mPreviousTargetCell[0] = -1; mPreviousTargetCell[1] = -1; - mContent.onDragEnter(); mOnExitAlarm.cancelAlarm(); } @@ -661,7 +661,6 @@ public class Folder extends LinearLayout implements DragSource, OnItemLongClickL mOnExitAlarm.setAlarm(ON_EXIT_CLOSE_DELAY); } mReorderAlarm.cancelAlarm(); - mContent.onDragExit(); } public void onDropCompleted(View target, DragObject d, boolean success) { @@ -841,7 +840,7 @@ public class Folder extends LinearLayout implements DragSource, OnItemLongClickL LauncherSettings.Favorites.CONTAINER_DESKTOP, mInfo.screen, mInfo.cellX, mInfo.cellY); } - LauncherModel.deleteFolderContentsFromDatabase(mLauncher, mInfo, true); + LauncherModel.deleteItemFromDatabase(mLauncher, mInfo); // Add the last remaining child to the workspace in place of the folder if (finalItem != null) { @@ -870,9 +869,9 @@ public class Folder extends LinearLayout implements DragSource, OnItemLongClickL si.cellX = lp.cellX = mEmptyCell[0]; si.cellX = lp.cellY = mEmptyCell[1]; mContent.addViewToCellLayout(mCurrentDragView, -1, (int)item.id, lp, true); - mSuppressOnAdd = true; - mItemsInvalidated = true; + mLauncher.getDragLayer().animateViewIntoPosition(d.dragView, mCurrentDragView); setupContentDimension(getItemCount()); + mSuppressOnAdd = true; } mInfo.add(item); } |