Merge "Add logging for b/280105659" into udc-dev am: 4763e710fa (0da9f918) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java

+9 −0

Original line number	Original line	Diff line number	Diff line
	@@ -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;

packages/SystemUI/src/com/android/systemui/shade/ShadeLogger.kt

+37 −1

Original line number	Original line	Diff line number	Diff line
	@@ -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,