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

Commit 10d84571 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Notify light bar controller when GONE" into main

parents d3a1cb40 4d8f7269

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

+1 −0
Original line number Diff line number Diff line
@@ -446,6 +446,7 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, Dump 
                            mStatusBarKeyguardViewManager.onKeyguardFadedAway();

                        }

                        dispatchScrimsVisible();

                        dispatchBackScrimState(mScrimBehind.getViewAlpha());

                    }

                };

packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/ScrimControllerTest.java

+11 −0
Original line number Diff line number Diff line
@@ -1977,6 +1977,17 @@ public class ScrimControllerTest extends SysuiTestCase { 
        verify(mStatusBarKeyguardViewManager).onKeyguardFadedAway();

    }



    @Test

    public void primaryBouncerToGoneOnFinishCallsLightBarController() {

        reset(mLightBarController);

        mScrimController.mBouncerToGoneTransition.accept(

                new TransitionStep(KeyguardState.PRIMARY_BOUNCER, KeyguardState.GONE, 0f,

                        TransitionState.FINISHED, "ScrimControllerTest"));



        verify(mLightBarController).setScrimState(

                any(ScrimState.class), anyFloat(), any(GradientColors.class));

    }



    @Test

    public void testDoNotAnimateChangeIfOccludeAnimationPlaying() {

        mScrimController.setOccludeAnimationPlaying(true);