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

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

Merge "Fixing SysUI reporting expanded split shade state to launcher" into... 

Merge "Fixing SysUI reporting expanded split shade state to launcher" into tm-qpr-dev am: 625756be

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



Change-Id: I8f604d1f4c8a806aa0e27506e0574b9a1b447ecf
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents de6b93bd 625756be

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

+1 −1
Original line number Diff line number Diff line
@@ -5035,7 +5035,7 @@ public final class NotificationPanelViewController { 
    }



    public boolean isFullyExpanded() {

        return mExpandedHeight >= getMaxPanelHeight();

        return mExpandedHeight >= getMaxPanelTransitionDistance();

    }



    public boolean isFullyCollapsed() {

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

+9 −0
Original line number Diff line number Diff line
@@ -1680,6 +1680,15 @@ public class NotificationPanelViewControllerTest extends SysuiTestCase { 
        inOrder.verify(mNotificationStackScrollLayoutController).onExpansionStopped();

    }



    @Test

    public void inUnlockedSplitShade_transitioningMaxTransitionDistance_makesShadeFullyExpanded() {

        mStatusBarStateController.setState(SHADE);

        enableSplitShade(true);

        int transitionDistance = mNotificationPanelViewController.getMaxPanelTransitionDistance();

        mNotificationPanelViewController.setExpandedHeight(transitionDistance);

        assertThat(mNotificationPanelViewController.isFullyExpanded()).isTrue();

    }



    private static MotionEvent createMotionEvent(int x, int y, int action) {

        return MotionEvent.obtain(

                /* downTime= */ 0, /* eventTime= */ 0, action, x, y, /* metaState= */ 0);