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

Commit a465c31f authored by Nicolo' Mazzucato's avatar Nicolo' Mazzucato
Browse files

Group scrim related instant event under a track group 

This makes scrim instant event appear under an "scrim" top level group in perfetto when opening a process specific workflow (see aosp/3435719)

Bug: 337016334
Test: perfetto trace
Flag: NONE logging change
Change-Id: I94523ba2265e0dbb9ce37429069f0a508fcc8664
parent ed9a847e

packages/SystemUI/src/com/android/systemui/statusbar/LightRevealScrim.kt

+3 −4
Original line number Diff line number Diff line
@@ -11,13 +11,13 @@ import android.graphics.PorterDuffColorFilter 
import android.graphics.PorterDuffXfermode

import android.graphics.RadialGradient

import android.graphics.Shader

import android.os.Trace

import android.util.AttributeSet

import android.util.MathUtils.lerp

import android.view.MotionEvent

import android.view.View

import android.view.animation.PathInterpolator

import com.android.app.animation.Interpolators

import com.android.app.tracing.coroutines.TrackTracer

import com.android.keyguard.logging.ScrimLogger

import com.android.systemui.shade.TouchLogger

import com.android.systemui.statusbar.LightRevealEffect.Companion.getPercentPastThreshold
@@ -321,9 +321,8 @@ constructor( 
                }

                revealEffect.setRevealAmountOnScrim(value, this)

                updateScrimOpaque()

                Trace.traceCounter(

                    Trace.TRACE_TAG_APP,

                    "light_reveal_amount $logString",

                TrackTracer.instantForGroup(

                    "scrim", { "light_reveal_amount $logString" },

                    (field * 100).toInt()

                )

                invalidate()

packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java

+4 −4
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ import android.view.animation.Interpolator; 
import androidx.annotation.FloatRange;

import androidx.annotation.Nullable;



import com.android.app.tracing.coroutines.TrackTracer;

import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.colorextraction.ColorExtractor.GradientColors;

import com.android.internal.graphics.ColorUtils;
@@ -554,7 +555,7 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, Dump 


        final ScrimState oldState = mState;

        mState = state;

        Trace.traceCounter(Trace.TRACE_TAG_APP, "scrim_state", mState.ordinal());

        TrackTracer.instantForGroup("scrim", "state", mState.ordinal());



        if (mCallback != null) {

            mCallback.onCancelled();
@@ -1279,10 +1280,9 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, Dump 
                tint = getDebugScrimTint(scrimView);

            }



            Trace.traceCounter(Trace.TRACE_TAG_APP, getScrimName(scrimView) + "_alpha",

            TrackTracer.instantForGroup("scrim", getScrimName(scrimView) + "_alpha",

                    (int) (alpha * 255));



            Trace.traceCounter(Trace.TRACE_TAG_APP, getScrimName(scrimView) + "_tint",

            TrackTracer.instantForGroup("scrim", getScrimName(scrimView) + "_tint",

                    Color.alpha(tint));

            scrimView.setTint(tint);

            if (!mIsBouncerToGoneTransitionRunning) {

packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimState.java

+3 −3
Original line number Diff line number Diff line
@@ -17,8 +17,8 @@ 
package com.android.systemui.statusbar.phone;



import android.graphics.Color;

import android.os.Trace;



import com.android.app.tracing.coroutines.TrackTracer;

import com.android.systemui.dock.DockManager;

import com.android.systemui.res.R;

import com.android.systemui.scrim.ScrimView;
@@ -425,11 +425,11 @@ public enum ScrimState { 
            tint = scrim == mScrimInFront ? ScrimController.DEBUG_FRONT_TINT

                    : ScrimController.DEBUG_BEHIND_TINT;

        }

        Trace.traceCounter(Trace.TRACE_TAG_APP,

        TrackTracer.instantForGroup("scrim",

                scrim == mScrimInFront ? "front_scrim_alpha" : "back_scrim_alpha",

                (int) (alpha * 255));



        Trace.traceCounter(Trace.TRACE_TAG_APP,

        TrackTracer.instantForGroup("scrim",

                scrim == mScrimInFront ? "front_scrim_tint" : "back_scrim_tint",

                Color.alpha(tint));