Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5a72d497 authored by Jeff DeCew's avatar Jeff DeCew
Browse files

NSSL touch logs should spam the ShadeLog buffer instead of the NotifHeadsUpLog buffer 

Fixes: 290924586
Test: dumpsysui NotifHeadsUpLog -- observe no touch logs
Test: dumpsysui ShadeLog -- observe touch logs
Change-Id: I87feeeea10ae5af297231798a8e25f194511a5d7
parent 24b72bdf

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

+4 −4
Original line number Diff line number Diff line
@@ -3758,20 +3758,20 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable 
            case MotionEvent.ACTION_UP:

                if (mStatusBarState != StatusBarState.KEYGUARD && mTouchIsClick &&

                        isBelowLastNotification(mInitialTouchX, mInitialTouchY)) {

                    debugLog("handleEmptySpaceClick: touch event propagated further");

                    debugShadeLog("handleEmptySpaceClick: touch event propagated further");

                    mOnEmptySpaceClickListener.onEmptySpaceClicked(mInitialTouchX, mInitialTouchY);

                }

                break;

            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) {

            return;

        }

        mLogger.d(s);

        mLogger.logShadeDebugEvent(s);

    }



    private void logEmptySpaceClick(MotionEvent ev, boolean isTouchBelowLastNotification,

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

+5 −3
Original line number Diff line number Diff line
@@ -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.dagger.NotificationHeadsUpLog

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.logKey

import com.android.systemui.statusbar.notification.stack.NotificationStackScrollLayout.AnimationEvent.ANIMATION_TYPE_ADD
@@ -19,7 +20,8 @@ import javax.inject.Inject 


class NotificationStackScrollLogger @Inject constructor(

    @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) {

        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(

        isBelowLastNotification: Boolean,
@@ -71,7 +73,7 @@ class NotificationStackScrollLogger @Inject constructor( 
        touchIsClick: Boolean,

        motionEventDesc: String

    ) {

        buffer.log(TAG, DEBUG, {

        shadeLogBuffer.log(TAG, DEBUG, {

            int1 = statusBarState

            bool1 = touchIsClick

            bool2 = isBelowLastNotification