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

Commit 37e6322f authored by burakov's avatar burakov Committed by Danny Burakov
Browse files

[Dual Shade] Temporarily disable notifications clipping. 

The clipping was introduced in ag/31995137, but it inadvertently caused
an even more visible bug: it eliminated the shared element transition
of the notifications stack between the lock screen and shade.

The solution here might be a bit tricky, so this CL reverts the clipping
temporarily until we have a solution.

Fix: 411413281
Bug: 388475946
Bug: 391379412
Test: Manually tested by opening and closing both shades on both a
 folded and unfolded device, verifying the shared element transition
 of notification between the lock screen and shade appears correctly.
Flag: com.android.systemui.scene_container
Change-Id: I04c2fa4ca62d76567e9cc750cd4d26b4d9bedaf1
parent b67f7cd3

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/NotificationStackAppearanceIntegrationTest.kt

+1 −1
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ class NotificationStackAppearanceIntegrationTest : SysuiTestCase() { 


            // Same scenario on Dual Shade, shape should have clipping bounds

            kosmos.enableDualShade()

            assertThat(shape).isNotNull()

            assertThat(shape).isNull()

        }



    @Test

packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/ui/viewmodel/NotificationScrollViewModel.kt

+1 −1
Original line number Diff line number Diff line
@@ -256,7 +256,7 @@ constructor( 
        combine(shadeModeInteractor.shadeMode, shadeInteractor.qsExpansion) { shadeMode, qsExpansion

                ->

                when (shadeMode) {

                    is ShadeMode.Dual,

                    is ShadeMode.Dual -> false

                    is ShadeMode.Split -> true

                    is ShadeMode.Single -> qsExpansion < 0.5f

                }