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

Merge "Fixed consistent flicker on shade open after multitouch" into tm-qpr-dev

Browse Source
This commit is contained in:
Shawn Lee
2023-01-31 00:56:23 +00:00
committed by Android (Google) Code Review
parent 798eac1a56 38da44eec0
commit accfd44158
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4958,8 +4958,12 @@ public final class NotificationPanelViewController implements Dumpable {
beginJankMonitoring(); beginJankMonitoring();
} }
mInitialOffsetOnTouch = expandedHeight; mInitialOffsetOnTouch = expandedHeight;
mInitialExpandY = newY; if (!mTracking || isFullyCollapsed()) {
mInitialExpandX = newX; mInitialExpandY = newY;
mInitialExpandX = newX;
} else {
mShadeLog.d("not setting mInitialExpandY in startExpandMotion");
}
mInitialTouchFromKeyguard = mKeyguardStateController.isShowing(); mInitialTouchFromKeyguard = mKeyguardStateController.isShowing();
if (startTracking) { if (startTracking) {
mTouchSlopExceeded = true; mTouchSlopExceeded = true;
@@ -6143,8 +6147,12 @@ public final class NotificationPanelViewController implements Dumpable {
+ " false"); + " false");
return true; return true;
} }
mInitialExpandY = y; if (!mTracking || isFullyCollapsed()) {
mInitialExpandX = x; mInitialExpandY = y;
mInitialExpandX = x;
} else {
mShadeLog.d("not setting mInitialExpandY in onInterceptTouch");
}
mTouchStartedInEmptyArea = !isInContentBounds(x, y); mTouchStartedInEmptyArea = !isInContentBounds(x, y);
mTouchSlopExceeded = mTouchSlopExceededBeforeDown; mTouchSlopExceeded = mTouchSlopExceededBeforeDown;
mMotionAborted = false; mMotionAborted = false;
@@ -6333,7 +6341,8 @@ public final class NotificationPanelViewController implements Dumpable {
final float x = event.getX(pointerIndex); final float x = event.getX(pointerIndex);
final float y = event.getY(pointerIndex); final float y = event.getY(pointerIndex);
if (event.getActionMasked() == MotionEvent.ACTION_DOWN) { if (event.getActionMasked() == MotionEvent.ACTION_DOWN
|| event.getActionMasked() == MotionEvent.ACTION_MOVE) {
mGestureWaitForTouchSlop = shouldGestureWaitForTouchSlop(); mGestureWaitForTouchSlop = shouldGestureWaitForTouchSlop();
mIgnoreXTouchSlop = true; mIgnoreXTouchSlop = true;
} }