diff options
author | Adam Cohen <adamcohen@google.com> | 2011-07-21 14:24:06 -0700 |
---|---|---|
committer | Adam Cohen <adamcohen@google.com> | 2011-07-21 14:26:43 -0700 |
commit | 4b285c5a60028f7c9ce39cfb318a730d0ae95c27 (patch) | |
tree | 3e729d2c7d9ff0a286e8b0c1d2146e56ebf92b50 /src/com/android/launcher2/FolderIcon.java | |
parent | fc53cd22c9a78708c78c85946443f23ec8c59502 (diff) | |
download | android_packages_apps_Trebuchet-4b285c5a60028f7c9ce39cfb318a730d0ae95c27.tar.gz android_packages_apps_Trebuchet-4b285c5a60028f7c9ce39cfb318a730d0ae95c27.tar.bz2 android_packages_apps_Trebuchet-4b285c5a60028f7c9ce39cfb318a730d0ae95c27.zip |
Smoothing out transitions when adding from AllAppsCustomize
-> Making sure the dragview animates to the proper final position
-> Preventing add if item is released too early in the transition
Change-Id: I77882c02a6ce569436a6c8b5c3f4ed0023d5807e
Diffstat (limited to 'src/com/android/launcher2/FolderIcon.java')
-rw-r--r-- | src/com/android/launcher2/FolderIcon.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/com/android/launcher2/FolderIcon.java b/src/com/android/launcher2/FolderIcon.java index 93f56fb44..949a25e58 100644 --- a/src/com/android/launcher2/FolderIcon.java +++ b/src/com/android/launcher2/FolderIcon.java @@ -321,7 +321,10 @@ public class FolderIcon extends LinearLayout implements FolderListener { Rect to = finalRect; if (to == null) { to = new Rect(); + Workspace workspace = mLauncher.getWorkspace(); + workspace.setFinalTransitionTransform((CellLayout) getParent().getParent()); scaleRelativeToDragLayer = dragLayer.getDescendantRectRelativeToSelf(this, to); + workspace.resetTransitionTransform((CellLayout) getParent().getParent()); } int[] center = new int[2]; |