commit f5440cbd6c0525769d24b890e16313a728831e04
author Sunny Goyal <sunnygoyal@google.com> Wed Dec 14 15:13:00 2016 -0800
committer Sunny Goyal <sunnygoyal@google.com> Thu Dec 15 08:05:09 2016 -0800
tree 5af627139853df45b24c890fb91bef558ebe2aa1
parent e96798e885e3ac97b6de0a1c598eb09cf62349af

Removing FeatureFlag.LAUNCHER3_LEGACY_WORKSPACE_DND and corresponding logic

Change-Id: Ie10c087b4f72ee27be5bf12e2c81be5b7a3a6176

src/com/android/launcher3/Launcher.java

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 7775a6b..8bb4a5b 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -1332,8 +1332,6 @@
         }
 
         // Setup the drag controller (drop targets have to be added in reverse order in priority)
-        mDragController.setDragScroller(mWorkspace);
-        mDragController.setScrollView(mDragLayer);
         mDragController.setMoveTarget(mWorkspace);
         mDragController.addDropTarget(mWorkspace);
         mDropTargetBar.setup(mDragController);
@@ -3024,16 +3022,7 @@
         mStateTransitionAnimation.startAnimationToWorkspace(mState, mWorkspace.getState(),
                 Workspace.State.SPRING_LOADED, true /* animated */,
                 null /* onCompleteRunnable */);
-
-        if (isAppsViewVisible()) {
-            mState = State.APPS_SPRING_LOADED;
-        } else if (isWidgetsViewVisible()) {
-            mState = State.WIDGETS_SPRING_LOADED;
-        } else if (!FeatureFlags.LAUNCHER3_LEGACY_WORKSPACE_DND) {
-            mState = State.WORKSPACE_SPRING_LOADED;
-        } else {
-            mState = State.WORKSPACE;
-        }
+        mState = State.WORKSPACE_SPRING_LOADED;
     }
 
     public void exitSpringLoadedDragModeDelayed(final boolean successfulDrop, int delay,