diff options
| author | Sunny Goyal <sunnygoyal@google.com> | 2016-12-14 15:13:00 -0800 |
|---|---|---|
| committer | Sunny Goyal <sunnygoyal@google.com> | 2016-12-15 08:05:09 -0800 |
| commit | f5440cbd6c0525769d24b890e16313a728831e04 (patch) | |
| tree | 5af627139853df45b24c890fb91bef558ebe2aa1 /src/com/android/launcher3/Launcher.java | |
| parent | e96798e885e3ac97b6de0a1c598eb09cf62349af (diff) | |
| download | android_packages_apps_Trebuchet-f5440cbd6c0525769d24b890e16313a728831e04.tar.gz android_packages_apps_Trebuchet-f5440cbd6c0525769d24b890e16313a728831e04.tar.bz2 android_packages_apps_Trebuchet-f5440cbd6c0525769d24b890e16313a728831e04.zip | |
Removing FeatureFlag.LAUNCHER3_LEGACY_WORKSPACE_DND and corresponding logic
Change-Id: Ie10c087b4f72ee27be5bf12e2c81be5b7a3a6176
Diffstat (limited to 'src/com/android/launcher3/Launcher.java')
| -rw-r--r-- | src/com/android/launcher3/Launcher.java | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index 7775a6bc5..8bb4a5b8f 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -1332,8 +1332,6 @@ public class Launcher extends Activity } // 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 @@ public class Launcher extends Activity 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, |