diff options
| author | Andrei Stingaceanu <stg@google.com> | 2017-09-11 17:55:39 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-09-11 17:55:39 +0000 |
| commit | 160d23ece3cbdaf917e861bbb01cab4d52e4ed48 (patch) | |
| tree | 0364bdf201607aa498e55cbbc487ec02afbce648 /core/java/android/widget/TextView.java | |
| parent | e3237d033739db86243214bf1822d6aee95600ab (diff) | |
| parent | ddb8ced9599ba7fc6825b0274cb04207b57de31d (diff) | |
Merge "TextView longpress 2 haptic feedback fix" into oc-mr1-dev am: 04b6095082
am: ddb8ced959
Change-Id: Id1ebf69c0f3c94f5c505c2bbe2f2dc52cb342fbf
Diffstat (limited to 'core/java/android/widget/TextView.java')
| -rw-r--r-- | core/java/android/widget/TextView.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java index 140ecc161057..3b9f7918ce55 100644 --- a/core/java/android/widget/TextView.java +++ b/core/java/android/widget/TextView.java @@ -10942,6 +10942,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener @Override public boolean performLongClick() { boolean handled = false; + boolean performedHapticFeedback = false; if (mEditor != null) { mEditor.mIsBeingLongClicked = true; @@ -10949,6 +10950,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener if (super.performLongClick()) { handled = true; + performedHapticFeedback = true; } if (mEditor != null) { @@ -10957,7 +10959,9 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener } if (handled) { - performHapticFeedback(HapticFeedbackConstants.LONG_PRESS); + if (!performedHapticFeedback) { + performHapticFeedback(HapticFeedbackConstants.LONG_PRESS); + } if (mEditor != null) mEditor.mDiscardNextActionUp = true; } else { MetricsLogger.action( |