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

Commit f97d7f73 authored by Selim Cinek's avatar Selim Cinek
Browse files

DO NOT MERGE Revert all scrim related changes in qpr 

This reverts commit 9449cfc4.
This reverts commit 22fa9757.
This reverts commit bde48202.

Bug: 141649119
Bug: 143195895 is also fixed on my taimen with the above.
Bug: 143185828
Test: atest SystemUITests
Change-Id: I225b10fef2f88d3436ef3a683c09717467b071ad
parent 06a28b06

packages/SystemUI/res/layout/super_status_bar.xml

+1 −9
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ 
    </com.android.systemui.statusbar.BackDropView>



    <com.android.systemui.statusbar.ScrimView

        android:id="@+id/scrim_for_bubble"

        android:id="@+id/scrim_behind"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:importantForAccessibility="no"
@@ -56,14 +56,6 @@ 
        android:layout_width="match_parent"

        android:layout_height="wrap_content" />



    <com.android.systemui.statusbar.ScrimView

        android:id="@+id/scrim_behind"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:importantForAccessibility="no"

        sysui:ignoreRightInset="true"

        />



    <include layout="@layout/status_bar_expanded"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

packages/SystemUI/src/com/android/systemui/SystemUIFactory.java

+1 −2
Original line number Diff line number Diff line
@@ -123,12 +123,11 @@ public class SystemUIFactory { 
    }



    public ScrimController createScrimController(ScrimView scrimBehind, ScrimView scrimInFront,

            ScrimView scrimForBubble,

            LockscreenWallpaper lockscreenWallpaper,

            TriConsumer<ScrimState, Float, GradientColors> scrimStateListener,

            Consumer<Integer> scrimVisibleListener, DozeParameters dozeParameters,

            AlarmManager alarmManager, KeyguardMonitor keyguardMonitor) {

        return new ScrimController(scrimBehind, scrimInFront, scrimForBubble, scrimStateListener,

        return new ScrimController(scrimBehind, scrimInFront, scrimStateListener,

                scrimVisibleListener, dozeParameters, alarmManager, keyguardMonitor);

    }

packages/SystemUI/src/com/android/systemui/bubbles/BubbleController.java

+4 −3
Original line number Diff line number Diff line
@@ -316,9 +316,10 @@ public class BubbleController implements ConfigurationController.ConfigurationLi 
        if (mStackView == null) {

            mStackView = new BubbleStackView(mContext, mBubbleData, mSurfaceSynchronizer);

            ViewGroup sbv = mStatusBarWindowController.getStatusBarView();

            int bubbleScrimIndex = sbv.indexOfChild(sbv.findViewById(R.id.scrim_for_bubble));

            int stackIndex = bubbleScrimIndex + 1;  // Show stack above bubble scrim.

            sbv.addView(mStackView, stackIndex,

            // TODO(b/130237686): When you expand the shade on top of expanded bubble, there is no

            //  scrim between bubble and the shade

            int bubblePosition = sbv.indexOfChild(sbv.findViewById(R.id.scrim_behind)) + 1;

            sbv.addView(mStackView, bubblePosition,

                    new FrameLayout.LayoutParams(MATCH_PARENT, MATCH_PARENT));

            if (mExpandListener != null) {

                mStackView.setExpandListener(mExpandListener);

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

+1 −1
Original line number Diff line number Diff line
@@ -604,7 +604,7 @@ public class LockIcon extends KeyguardAffordanceView implements OnUserInfoChange 
     */

    public void onScrimVisibilityChanged(@ScrimVisibility int scrimsVisible) {

        if (mWakeAndUnlockRunning

                && scrimsVisible == ScrimController.TRANSPARENT) {

                && scrimsVisible == ScrimController.VISIBILITY_FULLY_TRANSPARENT) {

            mWakeAndUnlockRunning = false;

            update();

        }

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

+88 −149
Original line number Diff line number Diff line
@@ -79,24 +79,23 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, OnCo 
    /**

     * When both scrims have 0 alpha.

     */

    public static final int TRANSPARENT = 0;

    public static final int VISIBILITY_FULLY_TRANSPARENT = 0;

    /**

     * When scrims aren't transparent (alpha 0) but also not opaque (alpha 1.)

     */

    public static final int SEMI_TRANSPARENT = 1;

    public static final int VISIBILITY_SEMI_TRANSPARENT = 1;

    /**

     * When at least 1 scrim is fully opaque (alpha set to 1.)

     */

    public static final int OPAQUE = 2;

    public static final int VISIBILITY_FULLY_OPAQUE = 2;



    @IntDef(prefix = { "VISIBILITY_" }, value = {

            TRANSPARENT,

            SEMI_TRANSPARENT,

            OPAQUE

            VISIBILITY_FULLY_TRANSPARENT,

            VISIBILITY_SEMI_TRANSPARENT,

            VISIBILITY_FULLY_OPAQUE

    })

    @Retention(RetentionPolicy.SOURCE)

    public @interface ScrimVisibility {

    }

    public @interface ScrimVisibility {}



    /**

     * Default alpha value for most scrims.
@@ -124,11 +123,8 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, OnCo 


    private ScrimState mState = ScrimState.UNINITIALIZED;

    private final Context mContext;



    protected final ScrimView mScrimInFront;

    protected final ScrimView mScrimBehind;

    protected final ScrimView mScrimForBubble;



    protected final ScrimView mScrimInFront;

    private final UnlockMethodCache mUnlockMethodCache;

    private final KeyguardUpdateMonitor mKeyguardUpdateMonitor;

    private final DozeParameters mDozeParameters;
@@ -157,15 +153,10 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, OnCo 
    private Runnable mOnAnimationFinished;

    private boolean mDeferFinishedListener;

    private final Interpolator mInterpolator = new DecelerateInterpolator();



    private float mInFrontAlpha = NOT_INITIALIZED;

    private float mBehindAlpha = NOT_INITIALIZED;

    private float mBubbleAlpha = NOT_INITIALIZED;



    private int mInFrontTint;

    private int mBehindTint;

    private int mBubbleTint;



    private float mCurrentInFrontAlpha  = NOT_INITIALIZED;

    private float mCurrentBehindAlpha = NOT_INITIALIZED;

    private int mCurrentInFrontTint;

    private int mCurrentBehindTint;

    private boolean mWallpaperVisibilityTimedOut;

    private int mScrimsVisibility;

    private final TriConsumer<ScrimState, Float, GradientColors> mScrimStateListener;
@@ -184,17 +175,14 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, OnCo 
    private boolean mWakeLockHeld;

    private boolean mKeyguardOccluded;



    public ScrimController(ScrimView scrimBehind, ScrimView scrimInFront, ScrimView scrimForBubble,

    public ScrimController(ScrimView scrimBehind, ScrimView scrimInFront,

            TriConsumer<ScrimState, Float, GradientColors> scrimStateListener,

            Consumer<Integer> scrimVisibleListener, DozeParameters dozeParameters,

            AlarmManager alarmManager, KeyguardMonitor keyguardMonitor) {

        mScrimBehind = scrimBehind;

        mScrimInFront = scrimInFront;

        mScrimForBubble = scrimForBubble;



        mScrimStateListener = scrimStateListener;

        mScrimVisibleListener = scrimVisibleListener;



        mContext = scrimBehind.getContext();

        mUnlockMethodCache = UnlockMethodCache.getInstance(mContext);

        mDarkenWhileDragging = !mUnlockMethodCache.canSkipBouncer();
@@ -225,13 +213,12 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, OnCo 


        final ScrimState[] states = ScrimState.values();

        for (int i = 0; i < states.length; i++) {

            states[i].init(mScrimInFront, mScrimBehind, mScrimForBubble, mDozeParameters);

            states[i].init(mScrimInFront, mScrimBehind, mDozeParameters);

            states[i].setScrimBehindAlphaKeyguard(mScrimBehindAlphaKeyguard);

        }



        mScrimBehind.setDefaultFocusHighlightEnabled(false);

        mScrimInFront.setDefaultFocusHighlightEnabled(false);

        mScrimForBubble.setDefaultFocusHighlightEnabled(false);



        updateScrims();

    }
@@ -270,14 +257,10 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, OnCo 
        mBlankScreen = state.getBlanksScreen();

        mAnimateChange = state.getAnimateChange();

        mAnimationDuration = state.getAnimationDuration();



        mInFrontTint = state.getFrontTint();

        mBehindTint = state.getBehindTint();

        mBubbleTint = state.getBubbleTint();



        mInFrontAlpha = state.getFrontAlpha();

        mBehindAlpha = state.getBehindAlpha();

        mBubbleAlpha = state.getBubbleAlpha();

        mCurrentInFrontTint = state.getFrontTint();

        mCurrentBehindTint = state.getBehindTint();

        mCurrentInFrontAlpha = state.getFrontAlpha();

        mCurrentBehindAlpha = state.getBehindAlpha();

        applyExpansionToAlpha();



        // Scrim might acquire focus when user is navigating with a D-pad or a keyboard.
@@ -410,20 +393,21 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, OnCo 
        if (mExpansionFraction != fraction) {

            mExpansionFraction = fraction;



            boolean relevantState = (mState == ScrimState.UNLOCKED

                    || mState == ScrimState.KEYGUARD

                    || mState == ScrimState.PULSING

                    || mState == ScrimState.BUBBLE_EXPANDED);

            if (!(relevantState && mExpansionAffectsAlpha)) {

            final boolean keyguardOrUnlocked = mState == ScrimState.UNLOCKED

                    || mState == ScrimState.KEYGUARD || mState == ScrimState.PULSING;

            if (!keyguardOrUnlocked || !mExpansionAffectsAlpha) {

                return;

            }



            applyExpansionToAlpha();



            if (mUpdatePending) {

                return;

            }



            setOrAdaptCurrentAnimation(mScrimBehind);

            setOrAdaptCurrentAnimation(mScrimInFront);

            setOrAdaptCurrentAnimation(mScrimForBubble);



            dispatchScrimState(mScrimBehind.getViewAlpha());



            // Reset wallpaper timeout if it's already timeout like expanding panel while PULSING
@@ -437,10 +421,11 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, OnCo 
    }



    private void setOrAdaptCurrentAnimation(View scrim) {

        float alpha = getCurrentScrimAlpha(scrim);

        if (isAnimating(scrim)) {

            // Adapt current animation.

        if (!isAnimating(scrim)) {

            updateScrimColor(scrim, getCurrentScrimAlpha(scrim), getCurrentScrimTint(scrim));

        } else {

            ValueAnimator previousAnimator = (ValueAnimator) scrim.getTag(TAG_KEY_ANIM);

            float alpha = getCurrentScrimAlpha(scrim);

            float previousEndValue = (Float) scrim.getTag(TAG_END_ALPHA);

            float previousStartValue = (Float) scrim.getTag(TAG_START_ALPHA);

            float relativeDiff = alpha - previousEndValue;
@@ -448,9 +433,6 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, OnCo 
            scrim.setTag(TAG_START_ALPHA, newStartValue);

            scrim.setTag(TAG_END_ALPHA, alpha);

            previousAnimator.setCurrentPlayTime(previousAnimator.getCurrentPlayTime());

        } else {

            // Set animation.

            updateScrimColor(scrim, alpha, getCurrentScrimTint(scrim));

        }

    }
@@ -459,27 +441,27 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, OnCo 
            return;

        }



        if (mState == ScrimState.UNLOCKED || mState == ScrimState.BUBBLE_EXPANDED) {

        if (mState == ScrimState.UNLOCKED) {

            // Darken scrim as you pull down the shade when unlocked

            float behindFraction = getInterpolatedFraction();

            behindFraction = (float) Math.pow(behindFraction, 0.8f);

            mBehindAlpha = behindFraction * GRADIENT_SCRIM_ALPHA_BUSY;

            mInFrontAlpha = 0;

            mCurrentBehindAlpha = behindFraction * GRADIENT_SCRIM_ALPHA_BUSY;

            mCurrentInFrontAlpha = 0;

        } else if (mState == ScrimState.KEYGUARD || mState == ScrimState.PULSING) {

            // Either darken of make the scrim transparent when you

            // pull down the shade

            float interpolatedFract = getInterpolatedFraction();

            float alphaBehind = mState.getBehindAlpha();

            if (mDarkenWhileDragging) {

                mBehindAlpha = MathUtils.lerp(GRADIENT_SCRIM_ALPHA_BUSY, alphaBehind,

                mCurrentBehindAlpha = MathUtils.lerp(GRADIENT_SCRIM_ALPHA_BUSY, alphaBehind,

                        interpolatedFract);

                mInFrontAlpha = mState.getFrontAlpha();

                mCurrentInFrontAlpha = mState.getFrontAlpha();

            } else {

                mBehindAlpha = MathUtils.lerp(0 /* start */, alphaBehind,

                mCurrentBehindAlpha = MathUtils.lerp(0 /* start */, alphaBehind,

                        interpolatedFract);

                mInFrontAlpha = mState.getFrontAlpha();

                mCurrentInFrontAlpha = mState.getFrontAlpha();

            }

            mBehindTint = ColorUtils.blendARGB(ScrimState.BOUNCER.getBehindTint(),

            mCurrentBehindTint = ColorUtils.blendARGB(ScrimState.BOUNCER.getBehindTint(),

                    mState.getBehindTint(), interpolatedFract);

        }

    }
@@ -504,8 +486,8 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, OnCo 
     */

    public void setAodFrontScrimAlpha(float alpha) {

        if (((mState == ScrimState.AOD && mDozeParameters.getAlwaysOn())

                || mState == ScrimState.PULSING) && mInFrontAlpha != alpha) {

            mInFrontAlpha = alpha;

                || mState == ScrimState.PULSING) && mCurrentInFrontAlpha != alpha) {

            mCurrentInFrontAlpha = alpha;

            updateScrims();

        }
@@ -519,9 +501,9 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, OnCo 
     */

    public void prepareForGentleWakeUp() {

        if (mState == ScrimState.AOD && mDozeParameters.getAlwaysOn()) {

            mInFrontAlpha = 1f;

            mInFrontTint = Color.BLACK;

            mBehindTint = Color.BLACK;

            mCurrentInFrontAlpha = 1f;

            mCurrentInFrontTint = Color.BLACK;

            mCurrentBehindTint = Color.BLACK;

            mAnimateChange = false;

            updateScrims();

            mAnimateChange = true;
@@ -539,8 +521,8 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, OnCo 


        if (mState == ScrimState.PULSING) {

            float newBehindAlpha = mState.getBehindAlpha();

            if (mBehindAlpha != newBehindAlpha) {

                mBehindAlpha = newBehindAlpha;

            if (mCurrentBehindAlpha != newBehindAlpha) {

                mCurrentBehindAlpha = newBehindAlpha;

                updateScrims();

            }

        }
@@ -562,11 +544,8 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, OnCo 
            // Only animate scrim color if the scrim view is actually visible

            boolean animateScrimInFront = mScrimInFront.getViewAlpha() != 0 && !mBlankScreen;

            boolean animateScrimBehind = mScrimBehind.getViewAlpha() != 0 && !mBlankScreen;

            boolean animateScrimForBubble = mScrimForBubble.getViewAlpha() != 0 && !mBlankScreen;



            mScrimInFront.setColors(mColors, animateScrimInFront);

            mScrimBehind.setColors(mColors, animateScrimBehind);

            mScrimForBubble.setColors(mColors, animateScrimForBubble);



            // Calculate minimum scrim opacity for white or black text.

            int textColor = mColors.supportsDarkText() ? Color.BLACK : Color.WHITE;
@@ -585,13 +564,12 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, OnCo 
        boolean occludedKeyguard = (mState == ScrimState.PULSING || mState == ScrimState.AOD)

                && mKeyguardOccluded;

        if (aodWallpaperTimeout || occludedKeyguard) {

            mBehindAlpha = 1;

            mCurrentBehindAlpha = 1;

        }

        setScrimAlpha(mScrimInFront, mInFrontAlpha);

        setScrimAlpha(mScrimBehind, mBehindAlpha);

        setScrimAlpha(mScrimForBubble, mBubbleAlpha);

        // The animation could have all already finished, let's call onFinished just in case

        onFinished();



        setScrimInFrontAlpha(mCurrentInFrontAlpha);

        setScrimBehindAlpha(mCurrentBehindAlpha);



        dispatchScrimsVisible();

    }
@@ -602,11 +580,11 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, OnCo 
    private void dispatchScrimsVisible() {

        final int currentScrimVisibility;

        if (mScrimInFront.getViewAlpha() == 1 || mScrimBehind.getViewAlpha() == 1) {

            currentScrimVisibility = OPAQUE;

            currentScrimVisibility = VISIBILITY_FULLY_OPAQUE;

        } else if (mScrimInFront.getViewAlpha() == 0 && mScrimBehind.getViewAlpha() == 0) {

            currentScrimVisibility = TRANSPARENT;

            currentScrimVisibility = VISIBILITY_FULLY_TRANSPARENT;

        } else {

            currentScrimVisibility = SEMI_TRANSPARENT;

            currentScrimVisibility = VISIBILITY_SEMI_TRANSPARENT;

        }



        if (mScrimsVisibility != currentScrimVisibility) {
@@ -627,6 +605,14 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, OnCo 
        }

    }



    private void setScrimBehindAlpha(float alpha) {

        setScrimAlpha(mScrimBehind, alpha);

    }



    private void setScrimInFrontAlpha(float alpha) {

        setScrimAlpha(mScrimInFront, alpha);

    }



    private void setScrimAlpha(ScrimView scrim, float alpha) {

        if (alpha == 0f) {

            scrim.setClickable(false);
@@ -637,26 +623,17 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, OnCo 
        updateScrim(scrim, alpha);

    }



    private String getScrimName(ScrimView scrim) {

        if (scrim == mScrimInFront) {

            return "front_scrim";

        } else if (scrim == mScrimBehind) {

            return "back_scrim";

        } else if (scrim == mScrimForBubble) {

            return "bubble_scrim";

        }

        return "unknown_scrim";

    }



    private void updateScrimColor(View scrim, float alpha, int tint) {

        alpha = Math.max(0, Math.min(1.0f, alpha));

        if (scrim instanceof ScrimView) {

            ScrimView scrimView = (ScrimView) scrim;



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

            Trace.traceCounter(Trace.TRACE_TAG_APP,

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

                    (int) (alpha * 255));



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

            Trace.traceCounter(Trace.TRACE_TAG_APP,

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

                    Color.alpha(tint));



            scrimView.setTint(tint);
@@ -690,9 +667,9 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, OnCo 


            @Override

            public void onAnimationEnd(Animator animation) {

                scrim.setTag(TAG_KEY_ANIM, null);

                onFinished(lastCallback);



                scrim.setTag(TAG_KEY_ANIM, null);

                dispatchScrimsVisible();



                if (!mDeferFinishedListener && mOnAnimationFinished != null) {
@@ -713,11 +690,9 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, OnCo 


    private float getCurrentScrimAlpha(View scrim) {

        if (scrim == mScrimInFront) {

            return mInFrontAlpha;

            return mCurrentInFrontAlpha;

        } else if (scrim == mScrimBehind) {

            return mBehindAlpha;

        } else if (scrim == mScrimForBubble) {

            return mBubbleAlpha;

            return mCurrentBehindAlpha;

        } else {

            throw new IllegalArgumentException("Unknown scrim view");

        }
@@ -725,11 +700,9 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, OnCo 


    private int getCurrentScrimTint(View scrim) {

        if (scrim == mScrimInFront) {

            return mInFrontTint;

            return mCurrentInFrontTint;

        } else if (scrim == mScrimBehind) {

            return mBehindTint;

        } else if (scrim == mScrimForBubble) {

            return mBubbleTint;

            return mCurrentBehindTint;

        } else {

            throw new IllegalArgumentException("Unknown scrim view");

        }
@@ -756,16 +729,6 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, OnCo 
    }



    private void onFinished(Callback callback) {

        if (isAnimating(mScrimBehind)

            || isAnimating(mScrimInFront)

            || isAnimating(mScrimForBubble)) {

            if (callback != null && callback != mCallback) {

                // Since we only notify the callback that we're finished once everything has

                // finished, we need to make sure that any changing callbacks are also invoked

                callback.onFinished();

            }

            return;

        }

        if (mWakeLockHeld) {

            mWakeLock.release(TAG);

            mWakeLockHeld = false;
@@ -782,12 +745,8 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, OnCo 
        // When unlocking with fingerprint, we'll fade the scrims from black to transparent.

        // At the end of the animation we need to remove the tint.

        if (mState == ScrimState.UNLOCKED) {

            mInFrontTint = Color.TRANSPARENT;

            mBehindTint = Color.TRANSPARENT;

            mBubbleTint = Color.TRANSPARENT;

            updateScrimColor(mScrimInFront, mInFrontAlpha, mInFrontTint);

            updateScrimColor(mScrimBehind, mBehindAlpha, mBehindTint);

            updateScrimColor(mScrimForBubble, mBubbleAlpha, mBubbleTint);

            mCurrentInFrontTint = Color.TRANSPARENT;

            mCurrentBehindTint = Color.TRANSPARENT;

        }

    }
@@ -846,7 +805,10 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, OnCo 
            } else {

                // update the alpha directly

                updateScrimColor(scrim, alpha, getCurrentScrimTint(scrim));

                onFinished();

            }

        } else {

            onFinished();

        }

    }
@@ -889,7 +851,6 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, OnCo 


    /**

     * Executes a callback after the frame has hit the display.

     *

     * @param callback What to run.

     */

    @VisibleForTesting
@@ -933,35 +894,16 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, OnCo 
    @Override

    public void dump(FileDescriptor fd, PrintWriter pw, String[] args) {

        pw.println(" ScrimController: ");

        pw.print("  state: ");

        pw.println(mState);



        pw.print("  frontScrim:");

        pw.print(" viewAlpha=");

        pw.print(mScrimInFront.getViewAlpha());

        pw.print(" alpha=");

        pw.print(mInFrontAlpha);

        pw.print(" tint=0x");

        pw.println(Integer.toHexString(mScrimInFront.getTint()));



        pw.print("  backScrim:");

        pw.print(" viewAlpha=");

        pw.print(mScrimBehind.getViewAlpha());

        pw.print(" alpha=");

        pw.print(mBehindAlpha);

        pw.print(" tint=0x");

        pw.println(Integer.toHexString(mScrimBehind.getTint()));



        pw.print("  bubbleScrim:");

        pw.print(" viewAlpha=");

        pw.print(mScrimForBubble.getViewAlpha());

        pw.print(" alpha=");

        pw.print(mBubbleAlpha);

        pw.print(" tint=0x");

        pw.println(Integer.toHexString(mScrimForBubble.getTint()));



        pw.print("   mTracking=");

        pw.println(mTracking);

        pw.print("  state: "); pw.println(mState);

        pw.print("  frontScrim:"); pw.print(" viewAlpha="); pw.print(mScrimInFront.getViewAlpha());

        pw.print(" alpha="); pw.print(mCurrentInFrontAlpha);

        pw.print(" tint=0x"); pw.println(Integer.toHexString(mScrimInFront.getTint()));



        pw.print("  backScrim:"); pw.print(" viewAlpha="); pw.print(mScrimBehind.getViewAlpha());

        pw.print(" alpha="); pw.print(mCurrentBehindAlpha);

        pw.print(" tint=0x"); pw.println(Integer.toHexString(mScrimBehind.getTint()));



        pw.print("   mTracking="); pw.println(mTracking);

    }



    public void setWallpaperSupportsAmbientMode(boolean wallpaperSupportsAmbientMode) {
@@ -1008,8 +950,8 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, OnCo 
        // in this case, back-scrim needs to be re-evaluated

        if (mState == ScrimState.AOD || mState == ScrimState.PULSING) {

            float newBehindAlpha = mState.getBehindAlpha();

            if (mBehindAlpha != newBehindAlpha) {

                mBehindAlpha = newBehindAlpha;

            if (mCurrentBehindAlpha != newBehindAlpha) {

                mCurrentBehindAlpha = newBehindAlpha;

                updateScrims();

            }

        }
@@ -1030,13 +972,10 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, OnCo 
    public interface Callback {

        default void onStart() {

        }



        default void onDisplayBlanked() {

        }



        default void onFinished() {

        }



        default void onCancelled() {

        }

        /** Returns whether to timeout wallpaper or not. */