diff options
| author | Winson Chung <winsonc@google.com> | 2013-08-02 18:55:24 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-08-02 18:55:25 +0000 |
| commit | 114cbcebbc9726782763d5823e78fccbdd7bceb7 (patch) | |
| tree | 4277c6cdcf240330306a4d9c8c34a762f23d5e37 | |
| parent | acdaf3cd63609da9fa944448d14fd526acc0248a (diff) | |
| parent | 5455425c1b0355f5dd652cc8e7a2369c33dc9883 (diff) | |
| download | android_packages_apps_Trebuchet-114cbcebbc9726782763d5823e78fccbdd7bceb7.tar.gz android_packages_apps_Trebuchet-114cbcebbc9726782763d5823e78fccbdd7bceb7.tar.bz2 android_packages_apps_Trebuchet-114cbcebbc9726782763d5823e78fccbdd7bceb7.zip | |
Merge "Fix bugs with dragging items out of folders" into jb-ub-gel-agar
| -rw-r--r-- | src/com/android/launcher3/Folder.java | 2 | ||||
| -rw-r--r-- | src/com/android/launcher3/Launcher.java | 10 |
2 files changed, 9 insertions, 3 deletions
diff --git a/src/com/android/launcher3/Folder.java b/src/com/android/launcher3/Folder.java index bb3993efc..c70cbe0a5 100644 --- a/src/com/android/launcher3/Folder.java +++ b/src/com/android/launcher3/Folder.java @@ -775,7 +775,7 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList if (target != this) { if (mOnExitAlarm.alarmPending()) { mOnExitAlarm.cancelAlarm(); - if (successfulDrop) { + if (!successfulDrop) { mSuppressFolderDeletion = true; } completeDragExit(); diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index fa9627973..b1fbd751c 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -802,6 +802,12 @@ public class Launcher extends Activity (System.currentTimeMillis() - startTimeCallbacks)); } } + if (mOnResumeCallbacks.size() > 0) { + for (int i = 0; i < mOnResumeCallbacks.size(); i++) { + mOnResumeCallbacks.get(i).run(); + } + mOnResumeCallbacks.clear(); + } // Reset the pressed state of icons that were locked in the press state while activities // were launching @@ -3438,11 +3444,11 @@ public class Launcher extends Activity } public void addOnResumeCallback(Runnable run) { - mBindOnResumeCallbacks.add(run); + mOnResumeCallbacks.add(run); } public void removeOnResumeCallback(Runnable run) { - mBindOnResumeCallbacks.remove(run); + mOnResumeCallbacks.remove(run); } /** |