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

Merge "NSSL touch logs should spam the ShadeLog buffer instead of the NotifHeadsUpLog buffer" into udc-qpr-dev

Browse Source
This commit is contained in:
Jeff DeCew
2023-07-13 16:54:49 +00:00
committed by Android (Google) Code Review
parent 6daa509a40 5a72d49718
commit ca293169ca
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java
View File

@@ -3758,20 +3758,20 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable
case MotionEvent.ACTION_UP: case MotionEvent.ACTION_UP:
if (mStatusBarState != StatusBarState.KEYGUARD && mTouchIsClick && if (mStatusBarState != StatusBarState.KEYGUARD && mTouchIsClick &&
isBelowLastNotification(mInitialTouchX, mInitialTouchY)) { isBelowLastNotification(mInitialTouchX, mInitialTouchY)) {
debugLog("handleEmptySpaceClick: touch event propagated further"); debugShadeLog("handleEmptySpaceClick: touch event propagated further");
mOnEmptySpaceClickListener.onEmptySpaceClicked(mInitialTouchX, mInitialTouchY); mOnEmptySpaceClickListener.onEmptySpaceClicked(mInitialTouchX, mInitialTouchY);
} }
break; break;
default: default:
debugLog("handleEmptySpaceClick: MotionEvent ignored"); debugShadeLog("handleEmptySpaceClick: MotionEvent ignored");
} }
} }
private void debugLog(@CompileTimeConstant final String s) { private void debugShadeLog(@CompileTimeConstant final String s) {
if (mLogger == null) { if (mLogger == null) {
return; return;
} }
mLogger.d(s); mLogger.logShadeDebugEvent(s);
} }
private void logEmptySpaceClick(MotionEvent ev, boolean isTouchBelowLastNotification, private void logEmptySpaceClick(MotionEvent ev, boolean isTouchBelowLastNotification,

8
packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLogger.kt
View File

@@ -7,6 +7,7 @@ import com.android.systemui.log.core.LogLevel.INFO
import com.android.systemui.log.core.LogLevel.ERROR import com.android.systemui.log.core.LogLevel.ERROR
import com.android.systemui.log.dagger.NotificationHeadsUpLog import com.android.systemui.log.dagger.NotificationHeadsUpLog
import com.android.systemui.log.dagger.NotificationRenderLog import com.android.systemui.log.dagger.NotificationRenderLog
import com.android.systemui.log.dagger.ShadeLog
import com.android.systemui.statusbar.notification.collection.NotificationEntry import com.android.systemui.statusbar.notification.collection.NotificationEntry
import com.android.systemui.statusbar.notification.logKey import com.android.systemui.statusbar.notification.logKey
import com.android.systemui.statusbar.notification.stack.NotificationStackScrollLayout.AnimationEvent.ANIMATION_TYPE_ADD import com.android.systemui.statusbar.notification.stack.NotificationStackScrollLayout.AnimationEvent.ANIMATION_TYPE_ADD
@@ -19,7 +20,8 @@ import javax.inject.Inject
class NotificationStackScrollLogger @Inject constructor( class NotificationStackScrollLogger @Inject constructor(
@NotificationHeadsUpLog private val buffer: LogBuffer, @NotificationHeadsUpLog private val buffer: LogBuffer,
@NotificationRenderLog private val notificationRenderBuffer: LogBuffer @NotificationRenderLog private val notificationRenderBuffer: LogBuffer,
@ShadeLog private val shadeLogBuffer: LogBuffer,
) { ) {
fun hunAnimationSkipped(entry: NotificationEntry, reason: String) { fun hunAnimationSkipped(entry: NotificationEntry, reason: String) {
buffer.log(TAG, INFO, { buffer.log(TAG, INFO, {
@@ -63,7 +65,7 @@ class NotificationStackScrollLogger @Inject constructor(
}) })
} }
fun d(@CompileTimeConstant msg: String) = buffer.log(TAG, DEBUG, msg) fun logShadeDebugEvent(@CompileTimeConstant msg: String) = shadeLogBuffer.log(TAG, DEBUG, msg)
fun logEmptySpaceClick( fun logEmptySpaceClick(
isBelowLastNotification: Boolean, isBelowLastNotification: Boolean,
@@ -71,7 +73,7 @@ class NotificationStackScrollLogger @Inject constructor(
touchIsClick: Boolean, touchIsClick: Boolean,
motionEventDesc: String motionEventDesc: String
) { ) {
buffer.log(TAG, DEBUG, { shadeLogBuffer.log(TAG, DEBUG, {
int1 = statusBarState int1 = statusBarState
bool1 = touchIsClick bool1 = touchIsClick
bool2 = isBelowLastNotification bool2 = isBelowLastNotification