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

Commit 9ade6c30 authored by Michał Brzeziński's avatar Michał Brzeziński Committed by Android (Google) Code Review
Browse files

Merge "Fixing shade not collapsing after rotating from split shade" into udc-dev

parents da32d859 cf4f4416

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

+2 −0
Original line number Diff line number Diff line
@@ -2011,6 +2011,8 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump 
        }

        updateExpansionAndVisibility();

        mNotificationStackScrollLayoutController.setPanelFlinging(false);

        // expandImmediate should be always reset at the end of animation

        mQsController.setExpandImmediate(false);

    }



    private boolean isInContentBounds(float x, float y) {

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

+7 −0
Original line number Diff line number Diff line
@@ -1096,6 +1096,13 @@ public class NotificationPanelViewControllerTest extends NotificationPanelViewCo 
        inOrder.verify(mNotificationStackScrollLayoutController).onExpansionStopped();

    }



    @Test

    public void onShadeFlingEnd_mExpandImmediateShouldBeReset() {

        mNotificationPanelViewController.onFlingEnd(false);



        verify(mQsController).setExpandImmediate(false);

    }



    @Test

    public void inUnlockedSplitShade_transitioningMaxTransitionDistance_makesShadeFullyExpanded() {

        mStatusBarStateController.setState(SHADE);