Merge "Filter hover events for clipped views" into mnc-dev (5b56be60) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/ExpandableView.java

+11 −0

Original line number	Diff line number	Diff line
		@@ -133,6 +133,14 @@ public abstract class ExpandableView extends FrameLayout {
		return getHeight();
		}

		@Override
		public boolean dispatchGenericMotionEvent(MotionEvent ev) {
		if (filterMotionEvent(ev)) {
		return super.dispatchGenericMotionEvent(ev);
		}
		return false;
		}

		@Override
		public boolean dispatchTouchEvent(MotionEvent ev) {
		if (filterMotionEvent(ev)) {
		@@ -143,6 +151,8 @@ public abstract class ExpandableView extends FrameLayout {

		protected boolean filterMotionEvent(MotionEvent event) {
		return event.getActionMasked() != MotionEvent.ACTION_DOWN
		&& event.getActionMasked() != MotionEvent.ACTION_HOVER_ENTER
		&& event.getActionMasked() != MotionEvent.ACTION_HOVER_MOVE
		\|\| event.getY() > mClipTopAmount && event.getY() < mActualHeight;
		}

		@@ -344,6 +354,7 @@ public abstract class ExpandableView extends FrameLayout {
		public void getBoundsOnScreen(Rect outRect, boolean clipToParent) {
		super.getBoundsOnScreen(outRect, clipToParent);
		outRect.bottom = (int) (outRect.top + getActualHeight());
		outRect.top += getClipTopAmount();
		}

		public int getContentHeight() {