Merge "Refactor StylusEventHelper to provide onButtonPress/Release methods" into ub-launcher3-master

1 files changed, 3 insertions, 2 deletions

diff --git a/WallpaperPicker/src/com/android/launcher3/WallpaperPickerActivity.java b/WallpaperPicker/src/com/android/launcher3/WallpaperPickerActivity.java
index c035f19c3..e05115a10 100644
--- a/WallpaperPicker/src/com/android/launcher3/WallpaperPickerActivity.java
+++ b/WallpaperPicker/src/com/android/launcher3/WallpaperPickerActivity.java
@@ -913,11 +913,12 @@ public class WallpaperPickerActivity extends WallpaperCropActivity {
         v.setOnLongClickListener(mLongClickListener);
 
         // Enable stylus button to also trigger long click.
-        final StylusEventHelper stylusEventHelper = new StylusEventHelper(v);
+        final StylusEventHelper stylusEventHelper =
+                new StylusEventHelper(new SimpleOnStylusPressListener(v), v);
         v.setOnTouchListener(new View.OnTouchListener() {
             @Override
             public boolean onTouch(View view, MotionEvent event) {
-                return stylusEventHelper.checkAndPerformStylusEvent(event);
+                return stylusEventHelper.onMotionEvent(event);
             }
         });
     }