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

Commit ceeb4ff9 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Removing logs for b/237743330" into tm-qpr-dev am: a1b16dfe 

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



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

packages/SystemUI/src/com/android/keyguard/logging/KeyguardLogger.kt

+0 −29
Original line number Diff line number Diff line
@@ -54,35 +54,6 @@ class KeyguardLogger @Inject constructor(@KeyguardLog private val buffer: LogBuf 
        buffer.log(TAG, INFO, { str1 = arg.toString() }, { "$msg: $str1" })

    }



    // TODO: remove after b/237743330 is fixed

    fun logStatusBarCalculatedAlpha(alpha: Float) {

        buffer.log(TAG, DEBUG, { double1 = alpha.toDouble() }, { "Calculated new alpha: $double1" })

    }



    // TODO: remove after b/237743330 is fixed

    fun logStatusBarExplicitAlpha(alpha: Float) {

        buffer.log(

            TAG,

            DEBUG,

            { double1 = alpha.toDouble() },

            { "new mExplicitAlpha value: $double1" }

        )

    }



    // TODO: remove after b/237743330 is fixed

    fun logStatusBarAlphaVisibility(visibility: Int, alpha: Float, state: String) {

        buffer.log(

            TAG,

            DEBUG,

            {

                int1 = visibility

                double1 = alpha.toDouble()

                str1 = state

            },

            { "changing visibility to $int1 with alpha $double1 in state: $str1" }

        )

    }



    @JvmOverloads

    fun logBiometricMessage(

        @CompileTimeConstant context: String,

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

+0 −11
Original line number Diff line number Diff line
@@ -475,9 +475,6 @@ public class KeyguardStatusBarViewController extends ViewController<KeyguardStat 
            newAlpha = Math.min(getKeyguardContentsAlpha(), alphaQsExpansion)

                    * mKeyguardStatusBarAnimateAlpha

                    * (1.0f - mKeyguardHeadsUpShowingAmount);

            if (newAlpha != mView.getAlpha() && (newAlpha == 0 || newAlpha == 1)) {

                mLogger.logStatusBarCalculatedAlpha(newAlpha);

            }

        }



        boolean hideForBypass =
@@ -500,10 +497,6 @@ public class KeyguardStatusBarViewController extends ViewController<KeyguardStat 
        if (mDisableStateTracker.isDisabled()) {

            visibility = View.INVISIBLE;

        }

        if (visibility != mView.getVisibility()) {

            mLogger.logStatusBarAlphaVisibility(visibility, alpha,

                    StatusBarState.toString(mStatusBarState));

        }

        mView.setAlpha(alpha);

        mView.setVisibility(visibility);

    }
@@ -608,10 +601,6 @@ public class KeyguardStatusBarViewController extends ViewController<KeyguardStat 
     * @param alpha a value between 0 and 1. -1 if the value is to be reset/ignored.

     */

    public void setAlpha(float alpha) {

        if (mExplicitAlpha != alpha && (mExplicitAlpha == -1 || alpha == -1)) {

            // logged if value changed to ignored or from ignored

            mLogger.logStatusBarExplicitAlpha(alpha);

        }

        mExplicitAlpha = alpha;

        updateViewState();

    }