Merge "TextView longpress 2 haptic feedback fix" into oc-mr1-dev (04b60950) · Commits · e / os / android_frameworks_base

core/java/android/widget/TextView.java

+5 −1

Original line number	Diff line number	Diff line
		@@ -10875,6 +10875,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;
		@@ -10882,6 +10883,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener

		if (super.performLongClick()) {
		handled = true;
		performedHapticFeedback = true;
		}

		if (mEditor != null) {
		@@ -10890,7 +10892,9 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
		}

		if (handled) {
		if (!performedHapticFeedback) {
		performHapticFeedback(HapticFeedbackConstants.LONG_PRESS);
		}
		if (mEditor != null) mEditor.mDiscardNextActionUp = true;
		} else {
		MetricsLogger.action(