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

Commit d9e3b3b3 authored by Lyn Han's avatar Lyn Han Committed by Automerger Merge Worker
Browse files

Merge "Fix alpha not fading on notifications after the first shade expansion"... 

Merge "Fix alpha not fading on notifications after the first shade expansion" into tm-qpr-dev am: 3def199b

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



Change-Id: I4f22eca38ab7b62074c25d2dbb87ab0096474741
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 267f656a 3def199b

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

+1 −1
Original line number Diff line number Diff line
@@ -163,7 +163,7 @@ public class StackScrollAlgorithm { 
                // which is more expensive.

                if (shelfState.hidden) {

                    // When the shelf is hidden, it won't clip views, so we don't hide rows

                    return;

                    continue;

                }



                final float shelfTop = shelfState.yTranslation;

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

+28 −1
Original line number Diff line number Diff line
@@ -179,7 +179,28 @@ class StackScrollAlgorithmTest : SysuiTestCase() { 
    }



    @Test

    fun resetViewStates_hiddenShelf_viewAlphaDoesNotChange() {

    fun resetViewStates_hiddenShelf_allRowsBecomesTransparent() {

        hostView.removeAllViews()

        val row1 = mockExpandableNotificationRow()

        hostView.addView(row1)

        val row2 = mockExpandableNotificationRow()

        hostView.addView(row2)



        ambientState.setStatusBarState(StatusBarState.KEYGUARD)

        ambientState.hideAmount = 0.25f

        notificationShelf.viewState.hidden = true

        ambientState.shelf = notificationShelf

        stackScrollAlgorithm.initView(context)



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



        val expected = 1f - ambientState.hideAmount

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

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

    }



    @Test

    fun resetViewStates_hiddenShelf_shelfAlphaDoesNotChange() {

        val expected = notificationShelf.viewState.alpha

        notificationShelf.viewState.hidden = true

        ambientState.shelf = notificationShelf
@@ -459,3 +480,9 @@ class StackScrollAlgorithmTest : SysuiTestCase() { 
        assertEquals(1f, currentRoundness)

    }

}



private fun mockExpandableNotificationRow(): ExpandableNotificationRow {

    return mock(ExpandableNotificationRow::class.java).apply {

        whenever(viewState).thenReturn(ExpandableViewState())

    }

}