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

Commit 91038078 authored by András Kurucz's avatar András Kurucz Committed by Automerger Merge Worker
Browse files

Merge "Fix LightReveal Scrim animation flickering" into udc-dev am: 9f200877... 

Merge "Fix LightReveal Scrim animation flickering" into udc-dev am: 9f200877 am: 1c695a32 am: c72758de

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23167463



Change-Id: Ia87b673f1d45a7bf043962e511b67506e82e943c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 405e9578 c72758de

packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java

+5 −0
Original line number Diff line number Diff line
@@ -2917,6 +2917,10 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump 
                && mBarState == StatusBarState.SHADE;

    }



    private boolean isPanelVisibleBecauseScrimIsAnimatingOff() {

        return mUnlockedScreenOffAnimationController.isAnimationPlaying();

    }



    @Override

    public boolean shouldHideStatusBarIconsWhenExpanded() {

        if (mIsLaunchAnimationRunning) {
@@ -3976,6 +3980,7 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump 
                || isPanelVisibleBecauseOfHeadsUp()

                || mTracking

                || mHeightAnimator != null

                || isPanelVisibleBecauseScrimIsAnimatingOff()

                && !mIsSpringBackAnimation;

    }

packages/SystemUI/tests/src/com/android/systemui/shade/NotificationPanelViewControllerTest.java

+34 −3
Original line number Diff line number Diff line
@@ -1106,7 +1106,7 @@ public class NotificationPanelViewControllerTest extends NotificationPanelViewCo 
    }



    @Test

    public void shadeExpanded_inShadeState() {

    public void shadeFullyExpanded_inShadeState() {

        mStatusBarStateController.setState(SHADE);



        mNotificationPanelViewController.setExpandedHeight(0);
@@ -1118,7 +1118,7 @@ public class NotificationPanelViewControllerTest extends NotificationPanelViewCo 
    }



    @Test

    public void shadeExpanded_onKeyguard() {

    public void shadeFullyExpanded_onKeyguard() {

        mStatusBarStateController.setState(KEYGUARD);



        int transitionDistance = mNotificationPanelViewController.getMaxPanelTransitionDistance();
@@ -1127,8 +1127,39 @@ public class NotificationPanelViewControllerTest extends NotificationPanelViewCo 
    }



    @Test

    public void shadeExpanded_onShadeLocked() {

    public void shadeFullyExpanded_onShadeLocked() {

        mStatusBarStateController.setState(SHADE_LOCKED);

        assertThat(mNotificationPanelViewController.isShadeFullyExpanded()).isTrue();

    }



    @Test

    public void shadeExpanded_whenHasHeight() {

        int transitionDistance = mNotificationPanelViewController.getMaxPanelTransitionDistance();

        mNotificationPanelViewController.setExpandedHeight(transitionDistance);

        assertThat(mNotificationPanelViewController.isExpanded()).isTrue();

    }



    @Test

    public void shadeExpanded_whenInstantExpanding() {

        mNotificationPanelViewController.expand(true);

        assertThat(mNotificationPanelViewController.isExpanded()).isTrue();

    }



    @Test

    public void shadeExpanded_whenHunIsPresent() {

        when(mHeadsUpManager.hasPinnedHeadsUp()).thenReturn(true);

        assertThat(mNotificationPanelViewController.isExpanded()).isTrue();

    }



    @Test

    public void shadeExpanded_whenWaitingForExpandGesture() {

        mNotificationPanelViewController.startWaitingForExpandGesture();

        assertThat(mNotificationPanelViewController.isExpanded()).isTrue();

    }



    @Test

    public void shadeExpanded_whenUnlockedOffscreenAnimationRunning() {

        when(mUnlockedScreenOffAnimationController.isAnimationPlaying()).thenReturn(true);

        assertThat(mNotificationPanelViewController.isExpanded()).isTrue();

    }

}