diff options
| author | Michael Jurka <mikejurka@google.com> | 2013-08-01 12:52:23 +0200 |
|---|---|---|
| committer | Michael Jurka <mikejurka@google.com> | 2013-08-02 13:58:43 +0200 |
| commit | 5455425c1b0355f5dd652cc8e7a2369c33dc9883 (patch) | |
| tree | 08a2d286618d9da260d0bb04ed4de39c7b992a07 /src/com/android/launcher3/Folder.java | |
| parent | 482a5b6ed389ef943990277e461444626c34ebf2 (diff) | |
| download | android_packages_apps_Trebuchet-5455425c1b0355f5dd652cc8e7a2369c33dc9883.tar.gz android_packages_apps_Trebuchet-5455425c1b0355f5dd652cc8e7a2369c33dc9883.tar.bz2 android_packages_apps_Trebuchet-5455425c1b0355f5dd652cc8e7a2369c33dc9883.zip | |
Fix bugs with dragging items out of folders
A folder of one item wasn't converted to a single
item - this fixes that regression
It was also possible, in some rare cases, that the
Folder cleanup code never ran after uninstalling
an app
Change-Id: Iee2490ed95d4f4a243b6f93411397a397aef7ae1
Diffstat (limited to 'src/com/android/launcher3/Folder.java')
| -rw-r--r-- | src/com/android/launcher3/Folder.java | 2 |
1 files changed, 1 insertions, 1 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(); |