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 am: accfd44158

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21131808

Change-Id: I569fd26a136b25119d3182d9b70f3c6f04e63167
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Shawn Lee
2023-01-31 01:39:36 +00:00
committed by Automerger Merge Worker
parent a32ccb00d0 accfd44158
commit c543f801d9
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();
}
mInitialOffsetOnTouch = expandedHeight;
mInitialExpandY = newY;
mInitialExpandX = newX;
if (!mTracking || isFullyCollapsed()) {
mInitialExpandY = newY;
mInitialExpandX = newX;
} else {
mShadeLog.d("not setting mInitialExpandY in startExpandMotion");
}
mInitialTouchFromKeyguard = mKeyguardStateController.isShowing();
if (startTracking) {
mTouchSlopExceeded = true;
@@ -6143,8 +6147,12 @@ public final class NotificationPanelViewController implements Dumpable {
+ " false");
return true;
}
mInitialExpandY = y;
mInitialExpandX = x;
if (!mTracking || isFullyCollapsed()) {
mInitialExpandY = y;
mInitialExpandX = x;
} else {
mShadeLog.d("not setting mInitialExpandY in onInterceptTouch");
}
mTouchStartedInEmptyArea = !isInContentBounds(x, y);
mTouchSlopExceeded = mTouchSlopExceededBeforeDown;
mMotionAborted = false;
@@ -6333,7 +6341,8 @@ public final class NotificationPanelViewController implements Dumpable {
final float x = event.getX(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();
mIgnoreXTouchSlop = true;
}