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

Merge "Fixing QS reacting to touches in notifications area in split shade" into sc-v2-dev

Browse Source
This commit is contained in:
Michał Brzeziński
2021-08-27 09:57:31 +00:00
committed by Android (Google) Code Review
parent a2bbce3ae2 3c6a594c13
commit df844e0c3a
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java
View File

@@ -1903,6 +1903,9 @@ public class NotificationPanelViewController extends PanelViewController {
private boolean handleQsTouch(MotionEvent event) { private boolean handleQsTouch(MotionEvent event) {
if (mShouldUseSplitNotificationShade && touchXOutsideOfQs(event.getX())) {
return false;
}
final int action = event.getActionMasked(); final int action = event.getActionMasked();
if (action == MotionEvent.ACTION_DOWN && getExpandedFraction() == 1f if (action == MotionEvent.ACTION_DOWN && getExpandedFraction() == 1f
&& mBarState != KEYGUARD && !mQsExpanded && isQsExpansionEnabled()) { && mBarState != KEYGUARD && !mQsExpanded && isQsExpansionEnabled()) {
@@ -1944,8 +1947,12 @@ public class NotificationPanelViewController extends PanelViewController {
return false; return false;
} }
private boolean touchXOutsideOfQs(float touchX) {
return touchX < mQsFrame.getX() || touchX > mQsFrame.getX() + mQsFrame.getWidth();
}
private boolean isInQsArea(float x, float y) { private boolean isInQsArea(float x, float y) {
if (x < mQsFrame.getX() || x > mQsFrame.getX() + mQsFrame.getWidth()) { if (touchXOutsideOfQs(x)) {
return false; return false;
} }
// Let's reject anything at the very bottom around the home handle in gesture nav // Let's reject anything at the very bottom around the home handle in gesture nav
@@ -4094,9 +4101,7 @@ public class NotificationPanelViewController extends PanelViewController {
@Override @Override
public void flingTopOverscroll(float velocity, boolean open) { public void flingTopOverscroll(float velocity, boolean open) {
// in split shade mode we want to expand/collapse QS only when touch happens within QS // in split shade mode we want to expand/collapse QS only when touch happens within QS
if (mShouldUseSplitNotificationShade if (mShouldUseSplitNotificationShade && touchXOutsideOfQs(mInitialTouchX)) {
&& (mInitialTouchX < mQsFrame.getX()
|| mInitialTouchX > mQsFrame.getX() + mQsFrame.getWidth())) {
return; return;
} }
mLastOverscroll = 0f; mLastOverscroll = 0f;