diff options
| author | Michael Wright <michaelwr@google.com> | 2015-05-14 13:47:07 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-14 13:47:10 +0000 |
| commit | 3d5286983447262f12b78785391681b20a71f6b2 (patch) | |
| tree | 0be664eb2032c1240880ff6e6daa80ec4685eeb8 /core/java/android/view/View.java | |
| parent | 07b83f1c9e8a7692a985aa2d13ac13fc5521aa4b (diff) | |
| parent | 96238051621ba2dc8a1c20fa48a00ec6ec4735d6 (diff) | |
| download | frameworks_base-3d5286983447262f12b78785391681b20a71f6b2.zip frameworks_base-3d5286983447262f12b78785391681b20a71f6b2.tar.gz frameworks_base-3d5286983447262f12b78785391681b20a71f6b2.tar.bz2 | |
Merge "Revert "Add new MotionEvent actions for button press and release."" into mnc-dev
Diffstat (limited to 'core/java/android/view/View.java')
| -rw-r--r-- | core/java/android/view/View.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java index 6ca320a..9e16b4b 100644 --- a/core/java/android/view/View.java +++ b/core/java/android/view/View.java @@ -5221,8 +5221,8 @@ public class View implements Drawable.Callback, KeyEvent.Callback, * @return True if the event was consumed. */ private boolean performStylusActionOnButtonPress(MotionEvent event) { - if (isStylusButtonPressable() && !mInStylusButtonPress && !mHasPerformedLongPress - && event.isButtonPressed(MotionEvent.BUTTON_STYLUS_SECONDARY)) { + if (isStylusButtonPressable() && !mInStylusButtonPress + && !mHasPerformedLongPress && event.isStylusButtonPressed()) { if (performStylusButtonPress()) { mInStylusButtonPress = true; setPressed(true, event.getX(), event.getY()); |