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

Commit ee37815a authored by Shawn Lee's avatar Shawn Lee Committed by Automerger Merge Worker
Browse files

Merge "Adding logging for shade fling expansion direction" into udc-dev am: be5b49dc 

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



Change-Id: I539ccacb24224cbf2f964c47630e4f12c948d4ed
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 44aa5601 be5b49dc

packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java

+3 −0
Original line number Diff line number Diff line
@@ -2112,6 +2112,9 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump 
                    ? QUICK_SETTINGS : (

                    mKeyguardStateController.canDismissLockScreen() ? UNLOCK : BOUNCER_UNLOCK);

            if (!isFalseTouch(x, y, interactionType)) {

                mShadeLog.logFlingExpands(vel, vectorVel, interactionType,

                        this.mFlingAnimationUtils.getMinVelocityPxPerSecond(),

                        mExpandedFraction > 0.5f, mAllowExpandForSmallExpansion);

                if (Math.abs(vectorVel) < this.mFlingAnimationUtils.getMinVelocityPxPerSecond()) {

                    expands = shouldExpandWhenNotFlinging();

                } else {

packages/SystemUI/src/com/android/systemui/shade/ShadeLogger.kt

+25 −0
Original line number Diff line number Diff line
@@ -253,6 +253,31 @@ class ShadeLogger @Inject constructor(@ShadeLog private val buffer: LogBuffer) { 
        )

    }



    fun logFlingExpands(

            vel: Float,

            vectorVel: Float,

            interactionType: Int,

            minVelocityPxPerSecond: Float,

            expansionOverHalf: Boolean,

            allowExpandForSmallExpansion: Boolean

    ) {

        buffer.log(

            TAG,

            LogLevel.VERBOSE,

            {

                int1 = interactionType

                long1 = vel.toLong()

                long2 = vectorVel.toLong()

                double1 = minVelocityPxPerSecond.toDouble()

                bool1 = expansionOverHalf

                bool2 = allowExpandForSmallExpansion

            },

            { "NPVC flingExpands called with vel: $long1, vectorVel: $long2, " +

                    "interactionType: $int1, minVelocityPxPerSecond: $double1 " +

                    "expansionOverHalf: $bool1, allowExpandForSmallExpansion: $bool2" }

        )

    }



    fun flingQs(flingType: Int, isClick: Boolean) {

        buffer.log(

            TAG,