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

Merge "Add logging for b/280105659" into udc-dev am: 4763e710fa

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

Change-Id: Iaadb67557536f140dad258efa25da13ed4fe3637
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-06-27 18:04:37 +00:00
committed by Automerger Merge Worker
parent c255fadec8 4763e710fa
commit 9ef267c8eb
2 changed files with 46 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3560,6 +3560,7 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump
} }
private void endMotionEvent(MotionEvent event, float x, float y, boolean forceCancel) { private void endMotionEvent(MotionEvent event, float x, float y, boolean forceCancel) {
mShadeLog.logEndMotionEvent("endMotionEvent called", forceCancel, false);
mTrackingPointer = -1; mTrackingPointer = -1;
mAmbientState.setSwipingUp(false); mAmbientState.setSwipingUp(false);
if ((mTracking && mTouchSlopExceeded) || Math.abs(x - mInitialExpandX) > mTouchSlop if ((mTracking && mTouchSlopExceeded) || Math.abs(x - mInitialExpandX) > mTouchSlop
@@ -3581,15 +3582,19 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump
} else if (event.getActionMasked() == MotionEvent.ACTION_CANCEL || forceCancel) { } else if (event.getActionMasked() == MotionEvent.ACTION_CANCEL || forceCancel) {
if (onKeyguard) { if (onKeyguard) {
expand = true; expand = true;
mShadeLog.logEndMotionEvent("endMotionEvent: cancel while on keyguard",
forceCancel, expand);
} else if (mCentralSurfaces.isBouncerShowingOverDream()) { } else if (mCentralSurfaces.isBouncerShowingOverDream()) {
expand = false; expand = false;
} else { } else {
// If we get a cancel, put the shade back to the state it was in when the // If we get a cancel, put the shade back to the state it was in when the
// gesture started // gesture started
expand = !mPanelClosedOnDown; expand = !mPanelClosedOnDown;
mShadeLog.logEndMotionEvent("endMotionEvent: cancel", forceCancel, expand);
} }
} else { } else {
expand = flingExpands(vel, vectorVel, x, y); expand = flingExpands(vel, vectorVel, x, y);
mShadeLog.logEndMotionEvent("endMotionEvent: flingExpands", forceCancel, expand);
} }
mDozeLog.traceFling(expand, mTouchAboveFalsingThreshold, mDozeLog.traceFling(expand, mTouchAboveFalsingThreshold,
@@ -4685,6 +4690,8 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump
mTouchSlopExceeded = mTouchSlopExceededBeforeDown; mTouchSlopExceeded = mTouchSlopExceededBeforeDown;
mMotionAborted = false; mMotionAborted = false;
mPanelClosedOnDown = isFullyCollapsed(); mPanelClosedOnDown = isFullyCollapsed();
mShadeLog.logPanelClosedOnDown("intercept down touch", mPanelClosedOnDown,
mExpandedFraction);
mCollapsedAndHeadsUpOnDown = false; mCollapsedAndHeadsUpOnDown = false;
mHasLayoutedSinceDown = false; mHasLayoutedSinceDown = false;
mUpdateFlingOnLayout = false; mUpdateFlingOnLayout = false;
@@ -4898,6 +4905,8 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump
startExpandMotion(x, y, false /* startTracking */, mExpandedHeight); startExpandMotion(x, y, false /* startTracking */, mExpandedHeight);
mMinExpandHeight = 0.0f; mMinExpandHeight = 0.0f;
mPanelClosedOnDown = isFullyCollapsed(); mPanelClosedOnDown = isFullyCollapsed();
mShadeLog.logPanelClosedOnDown("handle down touch", mPanelClosedOnDown,
mExpandedFraction);
mHasLayoutedSinceDown = false; mHasLayoutedSinceDown = false;
mUpdateFlingOnLayout = false; mUpdateFlingOnLayout = false;
mMotionAborted = false; mMotionAborted = false;

38
packages/SystemUI/src/com/android/systemui/shade/ShadeLogger.kt
View File

@@ -90,7 +90,7 @@ class ShadeLogger @Inject constructor(@ShadeLog private val buffer: LogBuffer) {
double1 = event.y.toDouble() double1 = event.y.toDouble()
}, },
{ {
"$str1\neventTime=$long1,downTime=$long2,y=$double1,action=$int1,class=$int2" "$str1: eventTime=$long1,downTime=$long2,y=$double1,action=$int1,class=$int2"
} }
) )
} }
@@ -280,6 +280,42 @@ class ShadeLogger @Inject constructor(@ShadeLog private val buffer: LogBuffer) {
) )
} }
fun logEndMotionEvent(
msg: String,
forceCancel: Boolean,
expand: Boolean,
)
{
buffer.log(
TAG,
LogLevel.VERBOSE,
{
str1 = msg
bool1 = forceCancel
bool2 = expand
},
{ "$str1; force=$bool1; expand=$bool2" }
)
}
fun logPanelClosedOnDown(
msg: String,
panelClosedOnDown: Boolean,
expandFraction: Float,
)
{
buffer.log(
TAG,
LogLevel.VERBOSE,
{
str1 = msg
bool1 = panelClosedOnDown
double1 = expandFraction.toDouble()
},
{ "$str1; mPanelClosedOnDown=$bool1; mExpandedFraction=$double1" }
)
}
fun flingQs(flingType: Int, isClick: Boolean) { fun flingQs(flingType: Int, isClick: Boolean) {
buffer.log( buffer.log(
TAG, TAG,