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

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

Merge "Fixing shade not collapsing after rotating from split shade" into udc-dev am: 9ade6c30 

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



Change-Id: I2185a555f3b8f0078bba57231cff973e5e6eb33a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3852f4da 9ade6c30

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);