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

Commit 8b644eff authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fixing "adb shell cmd statusbar expand-settings" command in split shade" into tm-dev

parents 5f99fcc0 9b836220

packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java

+9 −1
Original line number Diff line number Diff line
@@ -1690,7 +1690,15 @@ public class NotificationPanelViewController extends PanelViewController { 
            mQsExpandImmediate = true;

            setShowShelfOnly(true);

        }

        if (isFullyCollapsed()) {

        if (mShouldUseSplitNotificationShade && isOnKeyguard()) {

            // It's a special case as this method is likely to not be initiated by finger movement

            // but rather called from adb shell or accessibility service.

            // In the future method below could be used for non-split shade as well but currently

            // motion in that case looks worse than using flingSettings.

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

            mLockscreenShadeTransitionController.goToLockedShade(

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

        } else if (isFullyCollapsed()) {

            expand(true /* animate */);

        } else {

            traceQsJank(true /* startTracing */, false /* wasCancelled */);

packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/NotificationPanelViewControllerTest.java

+11 −0
Original line number Diff line number Diff line
@@ -1008,6 +1008,17 @@ public class NotificationPanelViewControllerTest extends SysuiTestCase { 
        verify(mLargeScreenShadeHeaderController).setActive(false);

    }



    @Test

    public void testExpandWithQsMethodIsUsingLockscreenTransitionController() {

        enableSplitShade(/* enabled= */ true);

        mStatusBarStateController.setState(KEYGUARD);



        mNotificationPanelViewController.expandWithQs();



        verify(mLockscreenShadeTransitionController).goToLockedShade(

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

    }



    @Test

    public void testUnlockAnimationDoesNotAffectScrim() {

        mNotificationPanelViewController.onUnlockHintStarted();