summaryrefslogtreecommitdiffstats
path: root/core/java
diff options
context:
space:
mode:
authorAdam Powell <adamp@google.com>2011-10-10 11:19:35 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-10-10 11:19:35 -0700
commit9dcd5afabe37872eab1b0bf2d4cab7f36b9f30a1 (patch)
treea25330a6f3abbf01856355a5bf3e060c2497147e /core/java
parent59ba2b2fabf91af7685f3c00eea7fc155d05f1fc (diff)
parent7d09f04363cdda6a3cf8b2ad1b67c9a07fa8975f (diff)
downloadframeworks_base-9dcd5afabe37872eab1b0bf2d4cab7f36b9f30a1.zip
frameworks_base-9dcd5afabe37872eab1b0bf2d4cab7f36b9f30a1.tar.gz
frameworks_base-9dcd5afabe37872eab1b0bf2d4cab7f36b9f30a1.tar.bz2
Merge "Bug 5430909 - Overlay action bar should consume hover events"
Diffstat (limited to 'core/java')
-rw-r--r--core/java/com/android/internal/widget/ActionBarContainer.java8
1 files changed, 8 insertions, 0 deletions
diff --git a/core/java/com/android/internal/widget/ActionBarContainer.java b/core/java/com/android/internal/widget/ActionBarContainer.java
index f95de62..0c572705 100644
--- a/core/java/com/android/internal/widget/ActionBarContainer.java
+++ b/core/java/com/android/internal/widget/ActionBarContainer.java
@@ -118,6 +118,14 @@ public class ActionBarContainer extends FrameLayout {
return true;
}
+ @Override
+ public boolean onHoverEvent(MotionEvent ev) {
+ super.onHoverEvent(ev);
+
+ // An action bar always eats hover events.
+ return true;
+ }
+
public void setTabContainer(ScrollingTabContainerView tabView) {
if (mTabContainer != null) {
removeView(mTabContainer);