commit 04b609508277a586fec64bb76542dcf9dd9f4f90
author Andrei Stingaceanu <stg@google.com> Mon Sep 11 09:39:22 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Sep 11 09:39:22 2017 +0000
tree acb08480c65e5f18630ad4462901d7b3491c88b5
parent 1b0ca0899d1dcc854d0a47f146f22f1bf8d35e4f
parent 4303f22535080267200a3d2b03a4dd0bc061bf38

Merge "TextView longpress 2 haptic feedback fix" into oc-mr1-dev

core/java/android/widget/TextView.java

diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java
index b2e2e88..cd2d2fd 100644
--- a/core/java/android/widget/TextView.java
+++ b/core/java/android/widget/TextView.java
@@ -10875,6 +10875,7 @@
     @Override
     public boolean performLongClick() {
         boolean handled = false;
+        boolean performedHapticFeedback = false;
 
         if (mEditor != null) {
             mEditor.mIsBeingLongClicked = true;
@@ -10882,6 +10883,7 @@
 
         if (super.performLongClick()) {
             handled = true;
+            performedHapticFeedback = true;
         }
 
         if (mEditor != null) {
@@ -10890,7 +10892,9 @@
         }
 
         if (handled) {
-            performHapticFeedback(HapticFeedbackConstants.LONG_PRESS);
+            if (!performedHapticFeedback) {
+              performHapticFeedback(HapticFeedbackConstants.LONG_PRESS);
+            }
             if (mEditor != null) mEditor.mDiscardNextActionUp = true;
         } else {
             MetricsLogger.action(