Don't do swipes to open all apps anymore.

http://b/issue?id=2169884
http://b/issue?id=2160569

1 files changed, 2 insertions, 50 deletions

diff --git a/src/com/android/launcher2/DragLayer.java b/src/com/android/launcher2/DragLayer.java
index f038c2a5c..73901d338 100644
--- a/src/com/android/launcher2/DragLayer.java
+++ b/src/com/android/launcher2/DragLayer.java
@@ -42,15 +42,7 @@ import android.widget.FrameLayout;
 public class DragLayer extends FrameLayout {
     private static final String TAG = "Launcher.DragLayer";
 
-    private static final int DRAG = 1;
-    private static final int SWIPE = 2;
-    private static final int BOTH = DRAG | SWIPE;
-
     DragController mDragController;
-    SwipeController mSwipeController;
-
-    private int mAllowed = BOTH;
-
 
     /**
      * Used to create a new DragLayer from XML.
@@ -66,10 +58,6 @@ public class DragLayer extends FrameLayout {
         mDragController = controller;
     }
     
-    public void setSwipeController(SwipeController controller) {
-        mSwipeController = controller;
-    }
-    
     @Override
     public boolean dispatchKeyEvent(KeyEvent event) {
         return mDragController.dispatchKeyEvent(event) || super.dispatchKeyEvent(event);
@@ -77,47 +65,11 @@ public class DragLayer extends FrameLayout {
 
     @Override
     public boolean onInterceptTouchEvent(MotionEvent ev) {
-        boolean result = false;
-
-        if (ev.getAction() == MotionEvent.ACTION_DOWN) {
-            mAllowed = BOTH;
-        }
-
-        if ((mAllowed & DRAG) != 0) {
-            result = mDragController.onInterceptTouchEvent(ev);
-            if (result) {
-                mAllowed = DRAG;
-            }
-        }
-
-        if ((mAllowed & SWIPE) != 0) {
-            result = mSwipeController.onInterceptTouchEvent(ev);
-            if (result) {
-                mAllowed = SWIPE;
-            }
-        }
-
-        return result;
+        return mDragController.onInterceptTouchEvent(ev);
     }
 
     @Override
     public boolean onTouchEvent(MotionEvent ev) {
-        boolean result = false;
-
-        if ((mAllowed & DRAG) != 0) {
-            result = mDragController.onTouchEvent(ev);
-            if (result) {
-                mAllowed = DRAG;
-            }
-        }
-
-        if ((mAllowed & SWIPE) != 0) {
-            result = mSwipeController.onTouchEvent(ev);
-            if (result) {
-                mAllowed = SWIPE;
-            }
-        }
-
-        return result;
+        return mDragController.onTouchEvent(ev);
     }
 }