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

Commit 30c7d961 authored by Lucas Dupin's avatar Lucas Dupin
Browse files

Recompute scrim alpha when enabling expansion 

Fixes: 152786931
Test: atest ScrimControllerTest
Change-Id: I73a4c37af0a024c6886c88a7c51c7c29e13c0218
parent f52438f9

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

+25 −18
Original line number Diff line number Diff line
@@ -440,24 +440,7 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, OnCo 
            if (!(relevantState && 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

            // and docking.

            if (mWallpaperVisibilityTimedOut) {

                mWallpaperVisibilityTimedOut = false;

                DejankUtils.postAfterTraversal(() -> {

                    mTimeTicker.schedule(mDozeParameters.getWallpaperAodDuration(),

                            AlarmTimeout.MODE_IGNORE_IF_SCHEDULED);

                });

            }

            applyAndDispatchExpansion();

        }

    }
@@ -513,6 +496,27 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, OnCo 
        }

    }



    private void applyAndDispatchExpansion() {

        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

        // and docking.

        if (mWallpaperVisibilityTimedOut) {

            mWallpaperVisibilityTimedOut = false;

            DejankUtils.postAfterTraversal(() -> {

                mTimeTicker.schedule(mDozeParameters.getWallpaperAodDuration(),

                        AlarmTimeout.MODE_IGNORE_IF_SCHEDULED);

            });

        }

    }



    /**

     * Sets the given drawable as the background of the scrim that shows up behind the

     * notifications.
@@ -1006,6 +1010,9 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, OnCo 


    public void setExpansionAffectsAlpha(boolean expansionAffectsAlpha) {

        mExpansionAffectsAlpha = expansionAffectsAlpha;

        if (expansionAffectsAlpha) {

            applyAndDispatchExpansion();

        }

    }



    public void setKeyguardOccluded(boolean keyguardOccluded) {