openkylin
/
platform_packages_apps_Launcher3
mirror of https://gitee.com/openkylin/platform_packages_apps_launcher3.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

am 4ff73887: Don\'t close folder when adding something to it 

* commit '4ff73887f28b831e8da38f2c417d55350ad88956':
  Don't close folder when adding something to it
This commit is contained in:
Jason Monk 2014-04-24 22:57:35 +00:00 committed by Android Git Automerger
parent 31f8622860 4ff73887f2
commit 6c4d8ecf99
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/android/launcher3/Folder.java
View File

@ -391,7 +391,7 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList
// We rearrange the items in case there are any empty gaps
setupContentForNumItems(count);
// If our folder has too many items we prune them from the list. This is an issue
// If our folder has too many items we prune them from the list. This is an issue
// when upgrading from the old Folders implementation which could contain an unlimited
// number of items.
for (ShortcutInfo item: overflow) {
@ -583,7 +583,7 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList
// by another item.
if (mContent.getChildAt(item.cellX, item.cellY) != null || item.cellX < 0 || item.cellY < 0
|| item.cellX >= mContent.getCountX() || item.cellY >= mContent.getCountY()) {
// This shouldn't happen, log it.
// This shouldn't happen, log it.
Log.e(TAG, "Folder order not properly persisted during bind");
if (!findAndSetEmptyCells(item)) {
return null;
@ -1177,7 +1177,7 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList
Runnable cleanUpRunnable = null;
// If we are coming from All Apps space, we need to remove the extra empty screen (which is
// normally done in Workspace#onDropExternal, as well zoom back in and close the folder.
// normally done in Workspace#onDropExternal, as well zoom back in.
if (d.dragSource != mLauncher.getWorkspace() && !(d.dragSource instanceof Folder)) {
cleanUpRunnable = new Runnable() {
@Override
@ -1185,7 +1185,6 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList
mLauncher.getWorkspace().removeExtraEmptyScreen(false, new Runnable() {
@Override
public void run() {
mLauncher.closeFolder();
mLauncher.exitSpringLoadedDragModeDelayed(true,
Launcher.EXIT_SPRINGLOADED_MODE_SHORT_TIMEOUT_FOLDER_CLOSE,
null);