diff options
| author | Adam Cohen <adamcohen@google.com> | 2013-10-13 21:30:27 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-10-13 21:30:27 +0000 |
| commit | 01c0214f727a25088ec4d62e64579155001cef9b (patch) | |
| tree | e5df3c6bed3f844ccbc01ac88215ea1323e97ece /src/com | |
| parent | e8b600c5e84e2779e1c9bfb18c691b2192936153 (diff) | |
| parent | 8ec05f9fa47f28740f92905a8614118a93835789 (diff) | |
| download | android_packages_apps_Trebuchet-01c0214f727a25088ec4d62e64579155001cef9b.tar.gz android_packages_apps_Trebuchet-01c0214f727a25088ec4d62e64579155001cef9b.tar.bz2 android_packages_apps_Trebuchet-01c0214f727a25088ec4d62e64579155001cef9b.zip | |
Merge "Fix bugs / jank with folder creation feedback (issue 11195148)" into jb-ub-now-indigo-rose
Diffstat (limited to 'src/com')
| -rw-r--r-- | src/com/android/launcher3/Workspace.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java index 1d5b5ac90..da0416235 100644 --- a/src/com/android/launcher3/Workspace.java +++ b/src/com/android/launcher3/Workspace.java @@ -3046,7 +3046,9 @@ public class Workspace extends SmoothPagedView private void cleanupFolderCreation() { if (mDragFolderRingAnimator != null) { mDragFolderRingAnimator.animateToNaturalState(); + mDragFolderRingAnimator = null; } + mFolderCreationAlarm.setOnAlarmListener(null); mFolderCreationAlarm.cancelAlarm(); } @@ -3390,9 +3392,11 @@ public class Workspace extends SmoothPagedView } public void onAlarm(Alarm alarm) { - if (mDragFolderRingAnimator == null) { - mDragFolderRingAnimator = new FolderRingAnimator(mLauncher, null); + if (mDragFolderRingAnimator != null) { + // This shouldn't happen ever, but just in case, make sure we clean up the mess. + mDragFolderRingAnimator.animateToNaturalState(); } + mDragFolderRingAnimator = new FolderRingAnimator(mLauncher, null); mDragFolderRingAnimator.setCell(cellX, cellY); mDragFolderRingAnimator.setCellLayout(layout); mDragFolderRingAnimator.animateToAcceptState(); |