diff options
author | Winson Chung <winsonc@google.com> | 2013-09-26 14:48:44 -0700 |
---|---|---|
committer | Winson Chung <winsonc@google.com> | 2013-09-26 16:17:07 -0700 |
commit | 780fe59a7af8b12fbdcd7f6841edaa7f2c2e019d (patch) | |
tree | a9181750afb09049eda9f69c205f8af1ceb10c24 /src/com/android/launcher3/DragController.java | |
parent | 88cc3f5aa2e9ac3ae0b24e563a44d320cc089cd8 (diff) | |
download | android_packages_apps_Trebuchet-780fe59a7af8b12fbdcd7f6841edaa7f2c2e019d.tar.gz android_packages_apps_Trebuchet-780fe59a7af8b12fbdcd7f6841edaa7f2c2e019d.tar.bz2 android_packages_apps_Trebuchet-780fe59a7af8b12fbdcd7f6841edaa7f2c2e019d.zip |
Integrating some aosp fixes, ensuring that we update the install queue before returning to Launcher.
- Fixing stuck page in All Apps (Bug 9347818)
- Fixing shortcuts to uninstalled apps from being installed (Bug 10726510)
- Consolidating vibration feedback
- Ensuring that we trim names during comparison in AllApps list
Change-Id: Ieaae4d85851ce771283b4684a8a60306da28cb3b
Diffstat (limited to 'src/com/android/launcher3/DragController.java')
-rw-r--r-- | src/com/android/launcher3/DragController.java | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/com/android/launcher3/DragController.java b/src/com/android/launcher3/DragController.java index 4c4f399a9..c63042778 100644 --- a/src/com/android/launcher3/DragController.java +++ b/src/com/android/launcher3/DragController.java @@ -24,8 +24,8 @@ import android.graphics.PointF; import android.graphics.Rect; import android.os.Handler; import android.os.IBinder; -import android.os.Vibrator; import android.util.Log; +import android.view.HapticFeedbackConstants; import android.view.KeyEvent; import android.view.MotionEvent; import android.view.VelocityTracker; @@ -51,7 +51,6 @@ public class DragController { private static final int SCROLL_DELAY = 500; private static final int RESCROLL_DELAY = 750; - private static final int VIBRATE_DURATION = 15; private static final boolean PROFILE_DRAWING_DURING_DRAG = false; @@ -66,7 +65,6 @@ public class DragController { private Launcher mLauncher; private Handler mHandler; - private final Vibrator mVibrator; // temporaries to avoid gc thrash private Rect mRectTemp = new Rect(); @@ -150,7 +148,6 @@ public class DragController { mHandler = new Handler(); mScrollZone = r.getDimensionPixelSize(R.dimen.scroll_zone); mVelocityTracker = VelocityTracker.obtain(); - mVibrator = (Vibrator) launcher.getSystemService(Context.VIBRATOR_SERVICE); float density = r.getDisplayMetrics().density; mFlingToDeleteThresholdVelocity = @@ -240,8 +237,6 @@ public class DragController { mDragObject.dragSource = source; mDragObject.dragInfo = dragInfo; - mVibrator.vibrate(VIBRATE_DURATION); - final DragView dragView = mDragObject.dragView = new DragView(mLauncher, b, registrationX, registrationY, 0, 0, b.getWidth(), b.getHeight(), initialDragViewScale); @@ -252,6 +247,7 @@ public class DragController { dragView.setDragRegion(new Rect(dragRegion)); } + mLauncher.getDragLayer().performHapticFeedback(HapticFeedbackConstants.LONG_PRESS); dragView.show(mMotionDownX, mMotionDownY); handleMoveEvent(mMotionDownX, mMotionDownY); } |