Merge "Adding drag target bar."

2011-06-01 17:28:46 -07:00
parent 7446fee6cb 4c98d9235d
commit e934f87c6a
17 changed files with 583 additions and 181 deletions
@@ -3309,7 +3309,7 @@ public class Workspace extends SmoothPagedView
                pixelX, pixelY, spanX, spanY, recycle);
    }

-    void setLauncher(Launcher launcher) {
+    void setup(Launcher launcher, DragController dragController) {
        mLauncher = launcher;
        mSpringLoadedDragController = new SpringLoadedDragController(mLauncher);

@@ -3318,9 +3318,6 @@ public class Workspace extends SmoothPagedView
            mCustomizationDrawerContent =
                mCustomizationDrawer.findViewById(com.android.internal.R.id.tabcontent);
        }
-    }
-
-    public void setDragController(DragController dragController) {
        mDragController = dragController;
    }