commit 2a14c8351525564a6fd35187f76f863226b2e856
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Apr 16 22:25:34 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Apr 16 22:25:34 2020 +0000
tree 0a9f16d96cf7964e451a96bdfc098fb867aae13b
parent 11e36db88a621e6a1f73c8302e8c52eff10718c8
parent a1567d50d0cbf4ed91207e005870a688a63a5f04

Merge "Prevent two overlapping long press actions." into ub-launcher3-rvc-dev

src/com/android/launcher3/CheckLongPressHelper.java

diff --git a/src/com/android/launcher3/CheckLongPressHelper.java b/src/com/android/launcher3/CheckLongPressHelper.java
index ef353f9..ff405ec 100644
--- a/src/com/android/launcher3/CheckLongPressHelper.java
+++ b/src/com/android/launcher3/CheckLongPressHelper.java
@@ -113,7 +113,10 @@
     }
 
     private void triggerLongPress() {
-        if ((mView.getParent() != null) && mView.hasWindowFocus() && !mHasPerformedLongPress) {
+        if ((mView.getParent() != null)
+                && mView.hasWindowFocus()
+                && (!mView.isPressed() || mListener == null)
+                && !mHasPerformedLongPress) {
             boolean handled;
             if (mListener != null) {
                 handled = mListener.onLongClick(mView);