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

Commit a586301f authored by Michał Brzeziński's avatar Michał Brzeziński Committed by Automerger Merge Worker
Browse files

Merge "Fixing QS not visible when opening split shade with adb command" into... 

Merge "Fixing QS not visible when opening split shade with adb command" into tm-qpr-dev am: dc5d95db

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



Change-Id: I559a72e8a33beee14e6f61ed4466291d94ef2d42
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents fc70a971 dc5d95db

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

+1 −1
Original line number Diff line number Diff line
@@ -2015,7 +2015,7 @@ public final class NotificationPanelViewController { 
            // case but currently motion in portrait looks worse than when using flingSettings.

            // TODO: make below function transitioning smoothly also in portrait with null target

            mLockscreenShadeTransitionController.goToLockedShade(

                    /* expandedView= */null, /* needsQSAnimation= */false);

                    /* expandedView= */null, /* needsQSAnimation= */true);

        } else if (isFullyCollapsed()) {

            expand(true /* animate */);

        } else {

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

+1 −1
Original line number Diff line number Diff line
@@ -1282,7 +1282,7 @@ public class NotificationPanelViewControllerTest extends SysuiTestCase { 
        mNotificationPanelViewController.expandWithQs();



        verify(mLockscreenShadeTransitionController).goToLockedShade(

                /* expandedView= */null, /* needsQSAnimation= */false);

                /* expandedView= */null, /* needsQSAnimation= */true);

    }



    @Test