Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Filter hover events for clipped views" into mnc-dev

Browse Source
This commit is contained in:
Adrian Roos
2015-06-11 16:24:09 +00:00
committed by Android (Google) Code Review
parent d168d184c0 e0c1890bdc
commit 5b56be6089
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
packages/SystemUI/src/com/android/systemui/statusbar/ExpandableView.java
View File

@@ -133,6 +133,14 @@ public abstract class ExpandableView extends FrameLayout {
return getHeight(); return getHeight();
} }
@Override
public boolean dispatchGenericMotionEvent(MotionEvent ev) {
if (filterMotionEvent(ev)) {
return super.dispatchGenericMotionEvent(ev);
}
return false;
}
@Override @Override
public boolean dispatchTouchEvent(MotionEvent ev) { public boolean dispatchTouchEvent(MotionEvent ev) {
if (filterMotionEvent(ev)) { if (filterMotionEvent(ev)) {
@@ -143,6 +151,8 @@ public abstract class ExpandableView extends FrameLayout {
protected boolean filterMotionEvent(MotionEvent event) { protected boolean filterMotionEvent(MotionEvent event) {
return event.getActionMasked() != MotionEvent.ACTION_DOWN return event.getActionMasked() != MotionEvent.ACTION_DOWN
&& event.getActionMasked() != MotionEvent.ACTION_HOVER_ENTER
&& event.getActionMasked() != MotionEvent.ACTION_HOVER_MOVE
|| event.getY() > mClipTopAmount && event.getY() < mActualHeight; || event.getY() > mClipTopAmount && event.getY() < mActualHeight;
} }
@@ -344,6 +354,7 @@ public abstract class ExpandableView extends FrameLayout {
public void getBoundsOnScreen(Rect outRect, boolean clipToParent) { public void getBoundsOnScreen(Rect outRect, boolean clipToParent) {
super.getBoundsOnScreen(outRect, clipToParent); super.getBoundsOnScreen(outRect, clipToParent);
outRect.bottom = (int) (outRect.top + getActualHeight()); outRect.bottom = (int) (outRect.top + getActualHeight());
outRect.top += getClipTopAmount();
} }
public int getContentHeight() { public int getContentHeight() {