commit 4db52312c10e822162a21c60404f06f6e507f0d6
author Joe Onorato <joeo@android.com> Tue Oct 06 11:17:43 2009 -0700
committer Joe Onorato <joeo@android.com> Tue Oct 06 11:17:43 2009 -0700
tree 75e28f2a81adcf1a5282c07d494330ecc0e90be4
parent 45713fcf1971742cd1409e9e7c5516865ffca113

Don't do swipes to open all apps anymore.

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

src/com/android/launcher2/Launcher.java

diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index 7075b5f..9360113 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -158,7 +158,6 @@
     private LayoutInflater mInflater;
 
     private DragController mDragController;
-    private SwipeController mSwipeController;
     private Workspace mWorkspace;
 
     private AppWidgetManager mAppWidgetManager;
@@ -513,18 +512,14 @@
     private void setupViews() {
         mDragController = new DragController(this);
         DragController dragController = mDragController;
-        mSwipeController = new SwipeController(this);
-        SwipeController swipeController = mSwipeController;
 
         DragLayer dragLayer = (DragLayer) findViewById(R.id.drag_layer);
         dragLayer.setDragController(dragController);
-        dragLayer.setSwipeController(swipeController);
 
         mAllAppsGrid = (AllAppsView)dragLayer.findViewById(R.id.all_apps_view);
         mAllAppsGrid.setLauncher(this);
         mAllAppsGrid.setDragController(dragController);
         mAllAppsGrid.setWillNotDraw(false); // We don't want a hole punched in our window.
-        swipeController.setAllAppsView(mAllAppsGrid);
 
         mWorkspace = (Workspace) dragLayer.findViewById(R.id.workspace);
         final Workspace workspace = mWorkspace;
@@ -1427,7 +1422,6 @@
         }
 
         if (mWorkspace.allowLongPress()) {
-            mSwipeController.cancelSwipe();
             if (cellInfo.cell == null) {
                 if (cellInfo.valid) {
                     // User long pressed on empty space
@@ -1601,7 +1595,7 @@
     }
 
     void showAllApps() {
-        mSwipeController.setMode(SwipeController.MODE_ALL_APPS, true);
+        mAllAppsGrid.zoom(1.0f, true);
         //mWorkspace.hide();
 
         // TODO: fade these two too
@@ -1611,7 +1605,7 @@
 
     void closeAllApps(boolean animated) {
         if (mAllAppsGrid.isVisible()) {
-            mSwipeController.setMode(SwipeController.MODE_WORKSPACE, animated);
+            mAllAppsGrid.zoom(0.0f, animated);
             mWorkspace.getChildAt(mWorkspace.getCurrentScreen()).requestFocus();
 
             // TODO: fade these two too