Merge "Add additional logging for b/227115380" into tm-qpr-dev (5bfca357) · Commits · e / os / android_frameworks_base

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

+5 −1

Original line number	Diff line number	Diff line
		@@ -2164,7 +2164,8 @@ public final class NotificationPanelViewController {
		mShadeLog.logMotionEvent(event,
		"onQsIntercept: move ignored because qs tracking disabled");
		}
		if ((h > getTouchSlop(event) \|\| (h < -getTouchSlop(event) && mQsExpanded))
		float touchSlop = getTouchSlop(event);
		if ((h > touchSlop \|\| (h < -touchSlop && mQsExpanded))
		&& Math.abs(h) > Math.abs(x - mInitialTouchX)
		&& shouldQuickSettingsIntercept(mInitialTouchX, mInitialTouchY, h)) {
		if (DEBUG_LOGCAT) Log.d(TAG, "onQsIntercept - start tracking expansion");
		@@ -2179,6 +2180,9 @@ public final class NotificationPanelViewController {
		mInitialTouchX = x;
		mNotificationStackScrollLayoutController.cancelLongPress();
		return true;
		} else {
		mShadeLog.logQsTrackingNotStarted(mInitialTouchY, y, h, touchSlop, mQsExpanded,
		mCollapsedOnDown, mKeyguardShowing, isQsExpansionEnabled());
		}
		break;

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

+57 −30

Original line number	Diff line number	Diff line
		@@ -11,10 +11,7 @@ import javax.inject.Inject
		private const val TAG = "systemui.shade"

		/** Lightweight logging utility for the Shade. */
		class ShadeLogger @Inject constructor(
		@ShadeLog
		private val buffer: LogBuffer
		) {
		class ShadeLogger @Inject constructor(@ShadeLog private val buffer: LogBuffer) {
		fun v(@CompileTimeConstant msg: String) {
		buffer.log(TAG, LogLevel.VERBOSE, msg)
		}
		@@ -28,21 +25,51 @@ class ShadeLogger @Inject constructor(
		}

		fun onQsInterceptMoveQsTrackingEnabled(h: Float) {
		log(LogLevel.VERBOSE,
		log(
		LogLevel.VERBOSE,
		{ double1 = h.toDouble() },
		{ "onQsIn[tercept: move action, QS tracking enabled. h = $double1" })
		{ "onQsIntercept: move action, QS tracking enabled. h = $double1" })
		}

		fun logQsTrackingNotStarted(
		initialTouchY: Float,
		y: Float,
		h: Float,
		touchSlop: Float,
		qsExpanded: Boolean,
		collapsedOnDown: Boolean,
		keyguardShowing: Boolean,
		qsExpansionEnabled: Boolean
		) {
		log(
		LogLevel.VERBOSE,
		{
		int1 = initialTouchY.toInt()
		int2 = y.toInt()
		long1 = h.toLong()
		double1 = touchSlop.toDouble()
		bool1 = qsExpanded
		bool2 = collapsedOnDown
		bool3 = keyguardShowing
		bool4 = qsExpansionEnabled
		},
		{
		"QsTrackingNotStarted: initTouchY=$int1,y=$int2,h=$long1,slop=$double1,qsExpanded=" +
		"$bool1,collapsedDown=$bool2,keyguardShowing=$bool3,qsExpansion=$bool4"
		})
		}

		fun logMotionEvent(event: MotionEvent, message: String) {
		log(LogLevel.VERBOSE, {
		log(
		LogLevel.VERBOSE,
		{
		str1 = message
		long1 = event.eventTime
		long2 = event.downTime
		int1 = event.action
		int2 = event.classification
		double1 = event.y.toDouble()
		}, {
		"$str1\neventTime=$long1,downTime=$long2,y=$double1,action=$int1,classification=$int2"
		})
		},
		{ "$str1\neventTime=$long1,downTime=$long2,y=$double1,action=$int1,classification=$int2" })
		}
		}