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

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

Browse Source
This commit is contained in:
TreeHugger Robot
2018-05-29 19:45:35 +00:00
committed by Android (Google) Code Review
parent a5d8c3718d c6c9d4052f
commit 287d4327cd
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -114,6 +114,10 @@ public class ButtonDispatcher {
return mVisibility != null ? mVisibility : View.VISIBLE;
}
public boolean isVisible() {
return getVisibility() == View.VISIBLE;
}
public float getAlpha() {
return mAlpha != null ? mAlpha : 1;
}

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

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