commit 0bd6a395d82d9b9cfa847678c65e243ba491df6e
author Svetoslav Ganov <svetoslavganov@google.com> Fri Apr 26 09:40:11 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Apr 26 09:40:11 2013 -0700
tree ebcb491ad826e42eb1899822a7a4fab4f676ae9c
parent 3fc184cf6e6f3e1d3e3360be11c76e0d081afaa1
parent d3859994624af39e0f75fd70fe623403f38c408d

am d3859994: am 951ce6c9: Merge "Revert change f449c0c381239dc0f78b0f01ecfb3889e056a597." into jb-mr2-dev

* commit 'd3859994624af39e0f75fd70fe623403f38c408d':
  Revert change f449c0c381239dc0f78b0f01ecfb3889e056a597.

core/java/android/view/View.java

diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index c65f252..ed6dc6c 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -8243,7 +8243,10 @@
             // in onHoverEvent.
             // Note that onGenericMotionEvent will be called by default when
             // onHoverEvent returns false (refer to dispatchGenericMotionEvent).
-            return dispatchGenericMotionEventInternal(event);
+            dispatchGenericMotionEventInternal(event);
+            // The event was already handled by calling setHovered(), so always
+            // return true.
+            return true;
         }
 
         return false;