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

Make touchXOutsideOfQs require split shade to be enabled

Browse Source 
Also renames the method and adds doc. There were 3 calls to
touchXOutsideOfQs and two of the usages were also checking whether
split shade was enabled. Adding the split shade check to the third
fixed b/259591763. Since all usages are paired with the split shade
check, I've moved that into the method and renamed it accordingly.

Fixes: 259591763
Test: manual and atest
Change-Id: I01edaeceac0a04cc1d2d9af22fbdaf88d3a3162f
This commit is contained in:
Justin Weir
2022-12-09 14:52:40 -05:00
parent b08cafd991
commit b72e0002ac
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java
View File

@@ -2325,7 +2325,7 @@ public final class NotificationPanelViewController implements Dumpable {
private boolean handleQsTouch(MotionEvent event) {
if (mSplitShadeEnabled && touchXOutsideOfQs(event.getX())) {
if (isSplitShadeAndTouchXOutsideQs(event.getX())) {
return false;
}
final int action = event.getActionMasked();
@@ -2382,12 +2382,14 @@ public final class NotificationPanelViewController implements Dumpable {
return false;
}
private boolean touchXOutsideOfQs(float touchX) {
return touchX < mQsFrame.getX() || touchX > mQsFrame.getX() + mQsFrame.getWidth();
/** Returns whether split shade is enabled and an x coordinate is outside of the QS frame. */
private boolean isSplitShadeAndTouchXOutsideQs(float touchX) {
return mSplitShadeEnabled && (touchX < mQsFrame.getX()
|| touchX > mQsFrame.getX() + mQsFrame.getWidth());
}
private boolean isInQsArea(float x, float y) {
if (touchXOutsideOfQs(x)) {
if (isSplitShadeAndTouchXOutsideQs(x)) {
return false;
}
// Let's reject anything at the very bottom around the home handle in gesture nav
@@ -5316,7 +5318,7 @@ public final class NotificationPanelViewController implements Dumpable {
@Override
public void flingTopOverscroll(float velocity, boolean open) {
// in split shade mode we want to expand/collapse QS only when touch happens within QS
if (mSplitShadeEnabled && touchXOutsideOfQs(mInitialTouchX)) {
if (isSplitShadeAndTouchXOutsideQs(mInitialTouchX)) {
return;
}
mLastOverscroll = 0f;