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

Commit ddd76f44 authored by Jeff DeCew's avatar Jeff DeCew Committed by Automerger Merge Worker
Browse files

Merge "NSSL touch logs should spam the ShadeLog buffer instead of the... 

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

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



Change-Id: I80092c51399d2bbdcbf5d44da711a52d38b16245
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a29bc41b d9baddf6

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