From 1a690cb785a1b1644ad4c97e8b755528b2222cfc Mon Sep 17 00:00:00 2001 From: Tony Wickham Date: Tue, 24 Nov 2015 15:34:53 -0800 Subject: [PATCH] Don't let folder be replaced with final item twice. Bug: 25732317 Change-Id: I77b3ddc8951583bebfb908fda934c9b80ddebce0 --- src/com/android/launcher3/Folder.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/com/android/launcher3/Folder.java b/src/com/android/launcher3/Folder.java index 8c831b92f..da895c685 100644 --- a/src/com/android/launcher3/Folder.java +++ b/src/com/android/launcher3/Folder.java @@ -452,6 +452,11 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList mContent.snapToPageImmediately(0); } + // This is set to true in close(), but isn't reset to false until onDropCompleted(). This + // leads to an consistent state if you drag out of the folder and drag back in without + // dropping. One resulting issue is that replaceFolderWithFinalItem() can be called twice. + mDeleteFolderOnDropCompleted = false; + Animator openFolderAnim = null; final Runnable onCompleteRunnable; if (!Utilities.ATLEAST_LOLLIPOP) { -- 2.11.0