diff options
| author | Svetoslav Ganov <svetoslavganov@google.com> | 2013-04-26 09:40:11 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-04-26 09:40:11 -0700 |
| commit | 0bd6a395d82d9b9cfa847678c65e243ba491df6e (patch) | |
| tree | ebcb491ad826e42eb1899822a7a4fab4f676ae9c /core/java/android/view/View.java | |
| parent | 3fc184cf6e6f3e1d3e3360be11c76e0d081afaa1 (diff) | |
| parent | d3859994624af39e0f75fd70fe623403f38c408d (diff) | |
| download | frameworks_base-0bd6a395d82d9b9cfa847678c65e243ba491df6e.zip frameworks_base-0bd6a395d82d9b9cfa847678c65e243ba491df6e.tar.gz frameworks_base-0bd6a395d82d9b9cfa847678c65e243ba491df6e.tar.bz2 | |
am d3859994: am 951ce6c9: Merge "Revert change f449c0c381239dc0f78b0f01ecfb3889e056a597." into jb-mr2-dev
* commit 'd3859994624af39e0f75fd70fe623403f38c408d':
Revert change f449c0c381239dc0f78b0f01ecfb3889e056a597.
Diffstat (limited to 'core/java/android/view/View.java')
| -rw-r--r-- | core/java/android/view/View.java | 5 |
1 files changed, 4 insertions, 1 deletions
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 @@ public class View implements Drawable.Callback, KeyEvent.Callback, // 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; |