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

Commit c3403c54 authored by Lucas Dupin's avatar Lucas Dupin Committed by android-build-merger
Browse files

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

am: 7c66fae3

Change-Id: I64c0792cbbf4285e33032a4d3517d3529c072ba4
parents 383f8bdc 7c66fae3

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 =