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

Commit 91660484 authored by Steve Elliott's avatar Steve Elliott Committed by Automerger Merge Worker
Browse files

Fix stale NSSL "fling" state caused by no-op fling am: 7f387f9a 

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



Change-Id: I1b2c18f237c9ea380f25e6abe90c920af417b12b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents af3fc0c1 7f387f9a

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

+1 −3
Original line number Diff line number Diff line
@@ -599,9 +599,7 @@ public abstract class PanelViewController { 
            float collapseSpeedUpFactor, boolean expandBecauseOfFalsing) {

        if (target == mExpandedHeight && mOverExpansion == 0.0f) {

            // We're at the target and didn't fling and there's no overshoot

            endJankMonitoring(CUJ_NOTIFICATION_SHADE_EXPAND_COLLAPSE);

            mKeyguardStateController.notifyPanelFlingEnd();

            notifyExpandingFinished();

            onFlingEnd(false /* cancelled */);

            return;

        }

        mIsFlinging = true;

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

+15 −0
Original line number Diff line number Diff line
@@ -985,6 +985,21 @@ public class NotificationPanelViewControllerTest extends SysuiTestCase { 
        verify(mKeyguardStateController).notifyPanelFlingEnd();

    }



    @Test

    public void testSwipe_exactlyToTarget_notifiesNssl() {

        // No over-expansion

        mNotificationPanelViewController.setOverExpansion(0f);

        // Fling to a target that is equal to the current position (i.e. a no-op fling).

        mNotificationPanelViewController.flingToHeight(

                0f,

                true,

                mNotificationPanelViewController.mExpandedHeight,

                1f,

                false);

        // Verify that the NSSL is notified that the panel is *not* flinging.

        verify(mNotificationStackScrollLayoutController).setPanelFlinging(false);

    }



    @Test

    public void testDoubleTapRequired_Keyguard() {

        FalsingManager.FalsingTapListener listener = getFalsingTapListener();