Merge "Fix long-press issue in RelativeTouchListener." into rvc-dev am: 8208ca5d05

Change-Id: Id6ceca10a7ae40ff76be78726bac3b8769c61758
2020-04-21 17:57:07 +00:00
parent c3be4b9943 8208ca5d05
commit 1f03d59f58
1 changed files with 3 additions and 1 deletions
--- a/packages/SystemUI/src/com/android/systemui/util/RelativeTouchListener.kt
+++ b/packages/SystemUI/src/com/android/systemui/util/RelativeTouchListener.kt
@@ -115,7 +115,9 @@ abstract class RelativeTouchListener : View.OnTouchListener {

                performedLongClick = false
                handler.postDelayed({
-                    performedLongClick = v.performLongClick()
+                    if (v.isLongClickable) {
+                        performedLongClick = v.performLongClick()
+                    }
                }, ViewConfiguration.getLongPressTimeout().toLong())
            }