OSDN Git Service
(root)
/
android-x86
/
packages-apps-Trebuchet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
674531f
)
Fix issue where deleting item from folder leaves extra page
author
Adam Cohen
<adamcohen@google.com>
Sat, 14 Dec 2013 01:18:10 +0000
(17:18 -0800)
committer
Adam Cohen
<adamcohen@google.com>
Sat, 14 Dec 2013 01:18:25 +0000
(17:18 -0800)
Change-Id: Ie741dbe5341d8237c85f732b26661d084b99f6e2
src/com/android/launcher3/Folder.java
patch
|
blob
|
history
diff --git
a/src/com/android/launcher3/Folder.java
b/src/com/android/launcher3/Folder.java
index
9637bbb
..
37a947c
100644
(file)
--- a/
src/com/android/launcher3/Folder.java
+++ b/
src/com/android/launcher3/Folder.java
@@
-772,7
+772,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);
}