commit e46772df7915a6f569584e6878162574ef5e98af
author Winson Chung <winsonc@google.com> Fri Apr 13 15:55:03 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Fri Apr 13 15:55:03 2012 -0700
tree 68cc6c31f7ded85b4c2a2e8a7e349e1346437c82
parent 86a68b88a7f5fc919a70dd7ea09135b960cc35d9
parent 8ef85c7a01376a98ce64d8fceb423a6f58e60d9d

Merge "Get Vibrator from Context instead of using private API."

src/com/android/launcher2/DragController.java

diff --git a/src/com/android/launcher2/DragController.java b/src/com/android/launcher2/DragController.java
index b3b14f4..c9bebe3 100644
--- a/src/com/android/launcher2/DragController.java
+++ b/src/com/android/launcher2/DragController.java
@@ -66,7 +66,7 @@
 
     private Launcher mLauncher;
     private Handler mHandler;
-    private final Vibrator mVibrator = new Vibrator();
+    private final Vibrator mVibrator;
 
     // temporaries to avoid gc thrash
     private Rect mRectTemp = new Rect();
@@ -150,6 +150,7 @@
         mHandler = new Handler();
         mScrollZone = launcher.getResources().getDimensionPixelSize(R.dimen.scroll_zone);
         mVelocityTracker = VelocityTracker.obtain();
+        mVibrator = (Vibrator)launcher.getSystemService(Context.VIBRATOR_SERVICE);
 
         float density = launcher.getResources().getDisplayMetrics().density;
         mFlingToDeleteThresholdVelocity = (int) (FLING_TO_DELETE_THRESHOLD_Y_VELOCITY * density);