summaryrefslogtreecommitdiffstats
path: root/core/java/android/view/View.java
diff options
context:
space:
mode:
authorMichael Wright <michaelwr@google.com>2015-05-14 14:46:25 +0100
committerMichael Wright <michaelwr@google.com>2015-05-14 14:46:25 +0100
commit96238051621ba2dc8a1c20fa48a00ec6ec4735d6 (patch)
tree5b95076d5cf96bed8a882d28e75808c31f387f36 /core/java/android/view/View.java
parentec0ce51b733f10c620cb9447b074f022d042e31d (diff)
downloadframeworks_base-96238051621ba2dc8a1c20fa48a00ec6ec4735d6.zip
frameworks_base-96238051621ba2dc8a1c20fa48a00ec6ec4735d6.tar.gz
frameworks_base-96238051621ba2dc8a1c20fa48a00ec6ec4735d6.tar.bz2
Revert "Add new MotionEvent actions for button press and release."
This reverts commit ec0ce51b733f10c620cb9447b074f022d042e31d.
Diffstat (limited to 'core/java/android/view/View.java')
-rw-r--r--core/java/android/view/View.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index f4202bc..75dc0a2 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -4986,8 +4986,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());