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

Commit cc4efe08 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Update scrims when keyguard gets occluded" into pi-dev

parents 3e389a84 63d72170

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

+1 −0
Original line number Diff line number Diff line
@@ -896,6 +896,7 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, OnCo 


    public void setKeyguardOccluded(boolean keyguardOccluded) {

        mKeyguardOccluded = keyguardOccluded;

        updateScrims();

    }



    public interface Callback {

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

+12 −0
Original line number Diff line number Diff line
@@ -541,6 +541,18 @@ public class ScrimControllerTest extends SysuiTestCase { 
        assertScrimVisibility(VISIBILITY_FULLY_TRANSPARENT, VISIBILITY_FULLY_OPAQUE);

    }



    @Test

    public void testHidesShowWhenLockedActivity_whenAlreadyInAod() {

        mScrimController.setWallpaperSupportsAmbientMode(true);

        mScrimController.transitionTo(ScrimState.AOD);

        mScrimController.finishAnimationsImmediately();

        assertScrimVisibility(VISIBILITY_FULLY_TRANSPARENT, VISIBILITY_FULLY_TRANSPARENT);



        mScrimController.setKeyguardOccluded(true);

        mScrimController.finishAnimationsImmediately();

        assertScrimVisibility(VISIBILITY_FULLY_TRANSPARENT, VISIBILITY_FULLY_OPAQUE);

    }



    @Test

    public void testEatsTouchEvent() {

        HashSet<ScrimState> eatsTouches =