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

Commit 157b3afa authored by Matt Pietal's avatar Matt Pietal
Browse files

Fix empty notif view flicker on keyguard 

As the shade collapses, there is very slight gap between
when the shade collapses and status bar state changes to
KEYGUARD. During this gap, the empty notif view visibility
changes from VISIBLE->INVISIBLE->VISIBLE->GONE.

Ensure that the empty notif view alpha does not change
if the shade is collapsed.

Fixes: 333445519
Test: atest StackScrollAlgorithmTest
Flag: None
Change-Id: I16450015f13b5394e63f304d23f20e5e76da5d59
parent c14c34a0

packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/StackScrollAlgorithm.java

+8 −0
Original line number Diff line number Diff line
@@ -169,6 +169,14 @@ public class StackScrollAlgorithm { 
                }

            }



            // On the final call to {@link #resetViewState}, the alpha is set back to 1f but

            // ambientState.isExpansionChanging() is now false. This causes a flicker on the

            // EmptyShadeView after the shade is collapsed. Make sure the empty shade view

            // isn't visible unless the shade is expanded.

            if (view instanceof EmptyShadeView && ambientState.getExpansionFraction() == 0f) {

                viewState.setAlpha(0f);

            }



            // For EmptyShadeView if on keyguard, we need to control the alpha to create

            // a nice transition when the user is dragging down the notification panel.

            if (view instanceof EmptyShadeView && ambientState.isOnKeyguard()) {

packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/stack/StackScrollAlgorithmTest.kt

+15 −2
Original line number Diff line number Diff line
@@ -393,9 +393,21 @@ class StackScrollAlgorithmTest : SysuiTestCase() { 
        assertThat(emptyShadeView.viewState.alpha).isEqualTo(expected)

    }



    @Test

    fun resetViewStates_shadeCollapsed_emptyShadeViewBecomesTransparent() {

        ambientState.expansionFraction = 0f

        stackScrollAlgorithm.initView(context)

        hostView.removeAllViews()

        hostView.addView(emptyShadeView)



        stackScrollAlgorithm.resetViewStates(ambientState, /* speedBumpIndex= */ 0)



        assertThat(emptyShadeView.viewState.alpha).isEqualTo(0f)

    }



    @Test

    fun resetViewStates_isOnKeyguard_emptyShadeViewBecomesOpaque() {

        ambientState.setStatusBarState(StatusBarState.SHADE)

        ambientState.setStatusBarState(StatusBarState.KEYGUARD)

        ambientState.fractionToShade = 0.25f

        stackScrollAlgorithm.initView(context)

        hostView.removeAllViews()
@@ -403,7 +415,8 @@ class StackScrollAlgorithmTest : SysuiTestCase() { 


        stackScrollAlgorithm.resetViewStates(ambientState, /* speedBumpIndex= */ 0)



        assertThat(emptyShadeView.viewState.alpha).isEqualTo(1f)

        val expected = getContentAlpha(ambientState.fractionToShade)

        assertThat(emptyShadeView.viewState.alpha).isEqualTo(expected)

    }



    @Test