summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAdam Cohen <adamcohen@google.com>2013-12-13 17:18:10 -0800
committerDanesh M <daneshm90@gmail.com>2014-06-06 22:54:23 -0700
commitfb574ff54797f34eb7359b4c845a237477baf102 (patch)
tree33589d6701ed2b925ee772d7ac030b42bc4d721c /src
parent0e2292f1b24de1db3917fb66ae124e867919cc5c (diff)
downloadandroid_packages_apps_Trebuchet-fb574ff54797f34eb7359b4c845a237477baf102.tar.gz
android_packages_apps_Trebuchet-fb574ff54797f34eb7359b4c845a237477baf102.tar.bz2
android_packages_apps_Trebuchet-fb574ff54797f34eb7359b4c845a237477baf102.zip
Fix issue where deleting item from folder leaves extra page
Change-Id: Ie741dbe5341d8237c85f732b26661d084b99f6e2
Diffstat (limited to 'src')
-rw-r--r--src/com/android/launcher3/Folder.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/com/android/launcher3/Folder.java b/src/com/android/launcher3/Folder.java
index 46a60cf62..b67767cae 100644
--- a/src/com/android/launcher3/Folder.java
+++ b/src/com/android/launcher3/Folder.java
@@ -781,7 +781,11 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList
}
completeDragExit();
}
- } else {
+ }
+
+ // This is kind of hacky, but in general, dropping on the workspace handles removing
+ // the extra screen, but dropping elsewhere (back to self, or onto delete) doesn't.
+ if (target != mLauncher.getWorkspace()) {
mLauncher.getWorkspace().removeExtraEmptyScreen(true, null);
}