From 55e57164ebfaaf757b9679db49cc9faf90a0e8ab Mon Sep 17 00:00:00 2001
From: Alan Viverette <alanv@google.com>
Date: Tue, 20 Dec 2016 13:52:57 -0500
Subject: [PATCH] Always handle hover events if the View is already hovered

Bug: 33379522
Test: ViewTest#testOnHoverEvent
Change-Id: I6a71ee6b6933b9ffe3e368e3c36f9465dba37b60
---
 core/java/android/view/View.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index 12658bd8f0cef..0174afc065153 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -11322,7 +11322,10 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
                 && isOnScrollbar(event.getX(), event.getY())) {
             awakenScrollBars();
         }
-        if (isHoverable()) {
+
+        // If we consider ourself hoverable, or if we we're already hovered,
+        // handle changing state in response to ENTER and EXIT events.
+        if (isHoverable() || isHovered()) {
             switch (action) {
                 case MotionEvent.ACTION_HOVER_ENTER:
                     setHovered(true);