Merge "Dialpad VM and + are now only accessible w/ double-tap instead of long hover."

am: 028214026f

Change-Id: Ia2fe90698505e00481513bfd7a099f4dc82a2823

1 files changed, 3 insertions, 5 deletions

diff --git a/java/com/android/dialer/dialpadview/DialpadKeyButton.java b/java/com/android/dialer/dialpadview/DialpadKeyButton.java
index 24ca9cc86..0c842ebb5 100644
--- a/java/com/android/dialer/dialpadview/DialpadKeyButton.java
+++ b/java/com/android/dialer/dialpadview/DialpadKeyButton.java
@@ -167,17 +167,15 @@ public class DialpadKeyButton extends FrameLayout {
           break;
         case MotionEvent.ACTION_HOVER_EXIT:
           if (mHoverBounds.contains(event.getX(), event.getY())) {
-            if (mLongHovered) {
-              performLongClick();
-            } else {
-              simulateClickForAccessibility();
-            }
+            simulateClickForAccessibility();
           }
 
           cancelLongHover();
           setClickable(mWasClickable);
           setLongClickable(mWasLongClickable);
           break;
+        default: // No-op
+          break;
       }
     }