openkylin
/
platform_packages_apps_Launcher3
mirror of https://gitee.com/openkylin/platform_packages_apps_launcher3.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Fix bugs / jank with folder creation feedback (issue 11195148)" into jb-ub-now-indigo-rose

This commit is contained in:
Adam Cohen 2013-10-13 21:30:27 +00:00 committed by Android (Google) Code Review
parent e8b600c5e8 8ec05f9fa4
commit 01c0214f72
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/launcher3/Workspace.java
View File

@ -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();