diff options
| author | Svetoslav Ganov <svetoslavganov@google.com> | 2013-04-26 09:38:18 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-04-26 09:38:18 -0700 |
| commit | d3859994624af39e0f75fd70fe623403f38c408d (patch) | |
| tree | 0fc14fda8de6ecd45d6d4f8f2ac54d49cfeddd21 /core/java | |
| parent | 01e48e7d1541920ece358257e4c2481936497835 (diff) | |
| parent | 951ce6c966311d36328a89784d4c2e6836e9ae87 (diff) | |
| download | frameworks_base-d3859994624af39e0f75fd70fe623403f38c408d.zip frameworks_base-d3859994624af39e0f75fd70fe623403f38c408d.tar.gz frameworks_base-d3859994624af39e0f75fd70fe623403f38c408d.tar.bz2 | |
am 951ce6c9: Merge "Revert change f449c0c381239dc0f78b0f01ecfb3889e056a597." into jb-mr2-dev
* commit '951ce6c966311d36328a89784d4c2e6836e9ae87':
Revert change f449c0c381239dc0f78b0f01ecfb3889e056a597.
Diffstat (limited to 'core/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 5d82d79..0938bb3 100644 --- a/core/java/android/view/View.java +++ b/core/java/android/view/View.java @@ -8228,7 +8228,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; |