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

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

Merge "Adding extra logging for double swipe down shade bug" into tm-qpr-dev... 

Merge "Adding extra logging for double swipe down shade bug" into tm-qpr-dev am: eff69830 am: 21ce2b82

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



Change-Id: I69cb228d7c9be64a72d892059066818f8897638e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 04170ac4 21ce2b82

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

+2 −0
Original line number Diff line number Diff line
@@ -2144,6 +2144,7 @@ public final class NotificationPanelViewController implements Dumpable { 
    void flingToHeight(float vel, boolean expand, float target,

            float collapseSpeedUpFactor, boolean expandBecauseOfFalsing) {

        mLastFlingWasExpanding = expand;

        mShadeLog.logLastFlingWasExpanding(expand);

        mHeadsUpTouchHelper.notifyFling(!expand);

        mKeyguardStateController.notifyPanelFlingStart(!expand /* flingingToDismiss */);

        setClosingWithAlphaFadeout(!expand && !isOnKeyguard() && getFadeoutAlpha() == 1.0f);
@@ -4624,6 +4625,7 @@ public final class NotificationPanelViewController implements Dumpable { 
        ipw.println(mBlockingExpansionForCurrentTouch);

        ipw.print("mExpectingSynthesizedDown="); ipw.println(mExpectingSynthesizedDown);

        ipw.print("mLastEventSynthesizedDown="); ipw.println(mLastEventSynthesizedDown);

        ipw.print("mLastFlingWasExpanding="); ipw.println(mLastFlingWasExpanding);

        ipw.print("mInterpolatedDarkAmount="); ipw.println(mInterpolatedDarkAmount);

        ipw.print("mLinearDarkAmount="); ipw.println(mLinearDarkAmount);

        ipw.print("mPulsing="); ipw.println(mPulsing);

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

+15 −1
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ import android.view.MotionEvent 
import com.android.systemui.log.dagger.ShadeLog

import com.android.systemui.plugins.log.LogBuffer

import com.android.systemui.plugins.log.LogLevel

import com.android.systemui.plugins.log.LogMessage

import com.google.errorprone.annotations.CompileTimeConstant

import javax.inject.Inject
@@ -234,4 +233,19 @@ class ShadeLogger @Inject constructor(@ShadeLog private val buffer: LogBuffer) { 
            }

        )

    }



    fun logLastFlingWasExpanding(

            expand: Boolean

    ) {

        buffer.log(

                TAG,

                LogLevel.VERBOSE,

                {

                    bool1 = expand

                },

                {

                    "NPVC mLastFlingWasExpanding set to: $bool1"

                }

        )

    }

}