aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-03-01 08:16:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

resolve merge conflicts of 6e74e89 to ub-launcher3-master

Browse Source 
Change-Id: I34e449ca3a91ee06e1983ac3a83cb7ca53567a91
This commit is contained in:
Tony
2016-09-23 19:42:53 -07:00
committed by Tony
parent 20eedeb5ae 6e74e899d3
commit 5eea1e89dd
11 changed files with 163 additions and 411 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/com/android/launcher3/allapps/AllAppsContainerView.java
View File

@@ -36,6 +36,7 @@ import android.view.ViewGroup;
import com.android.launcher3.AppInfo;
import com.android.launcher3.BaseContainerView;
import com.android.launcher3.BubbleTextView;
import com.android.launcher3.CellLayout;
import com.android.launcher3.DeleteDropTarget;
import com.android.launcher3.DeviceProfile;
@@ -53,6 +54,7 @@ import com.android.launcher3.dragndrop.DragOptions;
import com.android.launcher3.folder.Folder;
import com.android.launcher3.graphics.TintedDrawableSpan;
import com.android.launcher3.keyboard.FocusedItemDecorator;
import com.android.launcher3.shortcuts.DeepShortcutsContainer;
import com.android.launcher3.userevent.nano.LauncherLogProto.Target;
import com.android.launcher3.util.ComponentKey;
@@ -445,13 +447,32 @@ public class AllAppsContainerView extends BaseContainerView implements DragSourc
if (!mLauncher.isAppsViewVisible() ||
mLauncher.getWorkspace().isSwitchingState()) return false;
// Return if global dragging is not enabled
// Return if global dragging is not enabled or we are already dragging
if (!mLauncher.isDraggingEnabled()) return false;
if (mLauncher.getDragController().isDragging()) return false;
// Start the drag
mLauncher.getWorkspace().beginDragShared(v, this, new DragOptions());
// Enter spring loaded mode
mLauncher.enterSpringLoadedDragMode();
DragOptions dragOptions = new DragOptions();
if (v instanceof BubbleTextView) {
final BubbleTextView icon = (BubbleTextView) v;
if (icon.hasDeepShortcuts()) {
DeepShortcutsContainer dsc = DeepShortcutsContainer.showForIcon(icon);
if (dsc != null) {
dragOptions.deferDragCondition = dsc.createDeferDragCondition(new Runnable() {
@Override
public void run() {
icon.setVisibility(VISIBLE);
}
});
}
}
}
mLauncher.getWorkspace().beginDragShared(v, this, dragOptions);
if (FeatureFlags.LAUNCHER3_LEGACY_WORKSPACE_DND) {
// Enter spring loaded mode (the new workspace does this in
// onDragStart(), so we don't want to do it here)
mLauncher.enterSpringLoadedDragMode();
}
return false;
}
@@ -501,7 +522,7 @@ public class AllAppsContainerView extends BaseContainerView implements DragSourc
// target layout we were dropping on.
if (!success) {
boolean showOutOfSpaceMessage = false;
if (target instanceof Workspace) {
if (target instanceof Workspace && !mLauncher.getDragController().isDeferringDrag()) {
int currentScreen = mLauncher.getCurrentWorkspaceScreen();
Workspace workspace = (Workspace) target;
CellLayout layout = (CellLayout) workspace.getChildAt(currentScreen);