diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2015-04-16 22:38:55 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-04-16 22:39:00 +0000 |
commit | fb9ca2392894a3dea83570267f9597ac0750b9fd (patch) | |
tree | dbeffeec160b8753ddbe5e970936660cec315eba /src/com/android/launcher3/Folder.java | |
parent | fc3c1edf7bbc3f7cb23e79520731d13ccc2da046 (diff) | |
parent | f406615354a92367481a60966b6b873cae37fe4c (diff) | |
download | android_packages_apps_Trebuchet-fb9ca2392894a3dea83570267f9597ac0750b9fd.tar.gz android_packages_apps_Trebuchet-fb9ca2392894a3dea83570267f9597ac0750b9fd.tar.bz2 android_packages_apps_Trebuchet-fb9ca2392894a3dea83570267f9597ac0750b9fd.zip |
Merge "Fixing drag-n-drop for folders in hotseat." into ub-launcher3-burnaby
Diffstat (limited to 'src/com/android/launcher3/Folder.java')
-rw-r--r-- | src/com/android/launcher3/Folder.java | 26 |
1 files changed, 23 insertions, 3 deletions
diff --git a/src/com/android/launcher3/Folder.java b/src/com/android/launcher3/Folder.java index 0eb1fd8bb..116332438 100644 --- a/src/com/android/launcher3/Folder.java +++ b/src/com/android/launcher3/Folder.java @@ -49,6 +49,7 @@ import android.view.inputmethod.InputMethodManager; import android.widget.LinearLayout; import android.widget.TextView; +import com.android.launcher3.DragController.DragListener; import com.android.launcher3.FolderInfo.FolderListener; import com.android.launcher3.Workspace.ItemOperator; import com.android.launcher3.util.Thunk; @@ -61,7 +62,7 @@ import java.util.Collections; */ public class Folder extends LinearLayout implements DragSource, View.OnClickListener, View.OnLongClickListener, DropTarget, FolderListener, TextView.OnEditorActionListener, - View.OnFocusChangeListener { + View.OnFocusChangeListener, DragListener { private static final String TAG = "Launcher.Folder"; /** @@ -537,6 +538,20 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList mScrollPauseAlarm.setAlarm(SORTED_STICKY_REORDER_DELAY); } + // Since this folder opened by another controller, it might not get onDrop or + // onDropComplete. Perform cleanup once drag-n-drop ends. + mDragController.addDragListener(this); + } + + @Override + public void onDragStart(DragSource source, Object info, int dragAction) { } + + @Override + public void onDragEnd() { + if (mIsExternalDrag && mDragInProgress) { + completeDragExit(); + } + mDragController.removeDragListener(this); } @Thunk void sendCustomAccessibilityEvent(int type, String text) { @@ -678,11 +693,15 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList }; public void completeDragExit() { - mLauncher.closeFolder(); + if (mInfo.opened) { + mLauncher.closeFolder(); + mRearrangeOnClose = true; + } else { + rearrangeChildren(); + } mCurrentDragInfo = null; mCurrentDragView = null; mSuppressOnAdd = false; - mRearrangeOnClose = true; mIsExternalDrag = false; } @@ -1124,6 +1143,7 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList mSuppressOnAdd = false; // Clear the drag info, as it is no longer being dragged. mCurrentDragInfo = null; + mDragInProgress = false; } // This is used so the item doesn't immediately appear in the folder when added. In one case |