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

Merge "Add additional logging for b/227115380" into tm-qpr-dev am: 5bfca3578a am: 6559eb36aa

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

Change-Id: I3e2f66917f50dcd4a5e1407e613ae5c725e3aebe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Justin Weir
2022-10-17 18:43:20 +00:00
committed by Automerger Merge Worker
parent 86d26b2d53 6559eb36aa
commit 48b436ab5e
2 changed files with 62 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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;

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

@@ -11,38 +11,65 @@ 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
) {
fun v(@CompileTimeConstant msg: String) {
buffer.log(TAG, LogLevel.VERBOSE, msg)
}
class ShadeLogger @Inject constructor(@ShadeLog private val buffer: LogBuffer) {
fun v(@CompileTimeConstant msg: String) {
buffer.log(TAG, LogLevel.VERBOSE, msg)
}
private inline fun log(
logLevel: LogLevel,
initializer: LogMessage.() -> Unit,
noinline printer: LogMessage.() -> String
) {
buffer.log(TAG, logLevel, initializer, printer)
}
private inline fun log(
logLevel: LogLevel,
initializer: LogMessage.() -> Unit,
noinline printer: LogMessage.() -> String
) {
buffer.log(TAG, logLevel, initializer, printer)
}
fun onQsInterceptMoveQsTrackingEnabled(h: Float) {
log(LogLevel.VERBOSE,
{ double1 = h.toDouble() },
{ "onQsIn[tercept: move action, QS tracking enabled. h = $double1" })
}
fun onQsInterceptMoveQsTrackingEnabled(h: Float) {
log(
LogLevel.VERBOSE,
{ double1 = h.toDouble() },
{ "onQsIntercept: move action, QS tracking enabled. h = $double1" })
}
fun logMotionEvent(event: MotionEvent, message: String) {
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"
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,
{
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" })
}
}