Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 287d4327 authored May 29, 2018 by TreeHugger Robot Committed by Android (Google) Code Review May 29, 2018

Merge "Fix regression in swiping over rotation button." into pi-dev

parents a5d8c371 c6c9d405

packages/SystemUI/src/com/android/systemui/statusbar/phone/ButtonDispatcher.java

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -114,6 +114,10 @@ public class ButtonDispatcher {
	return mVisibility != null ? mVisibility : View.VISIBLE;		return mVisibility != null ? mVisibility : View.VISIBLE;
	}		}

			public boolean isVisible() {
			return getVisibility() == View.VISIBLE;
			}

	public float getAlpha() {		public float getAlpha() {
	return mAlpha != null ? mAlpha : 1;		return mAlpha != null ? mAlpha : 1;
	}		}

packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java

+5 −4

Original line number	Original line	Diff line number	Diff line
	@@ -336,13 +336,14 @@ public class NavigationBarView extends FrameLayout implements PluginListener<Nav
	int x = (int) event.getX();		int x = (int) event.getX();
	int y = (int) event.getY();		int y = (int) event.getY();
	mDownHitTarget = HIT_TARGET_NONE;		mDownHitTarget = HIT_TARGET_NONE;
	if (mBackButtonBounds.contains(x, y)) {		if (getBackButton().isVisible() && mBackButtonBounds.contains(x, y)) {
	mDownHitTarget = HIT_TARGET_BACK;		mDownHitTarget = HIT_TARGET_BACK;
	} else if (mHomeButtonBounds.contains(x, y)) {		} else if (getHomeButton().isVisible() && mHomeButtonBounds.contains(x, y)) {
	mDownHitTarget = HIT_TARGET_HOME;		mDownHitTarget = HIT_TARGET_HOME;
	} else if (mRecentsButtonBounds.contains(x, y)) {		} else if (getRecentsButton().isVisible() && mRecentsButtonBounds.contains(x, y)) {
	mDownHitTarget = HIT_TARGET_OVERVIEW;		mDownHitTarget = HIT_TARGET_OVERVIEW;
	} else if (mRotationButtonBounds.contains(x, y)) {		} else if (getRotateSuggestionButton().isVisible()
			&& mRotationButtonBounds.contains(x, y)) {
	mDownHitTarget = HIT_TARGET_ROTATION;		mDownHitTarget = HIT_TARGET_ROTATION;
	}		}
	break;		break;