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

Commit 0e47316e authored by Nicolò Mazzucato's avatar Nicolò Mazzucato Committed by Automerger Merge Worker
Browse files

Merge "Fix notifications count change during animation on keyguard" into tm-dev am: 4f81748b 

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



Change-Id: Ieac2bbe4168d4a3d817e2afe192e23fc386df807
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 31a1e3c5 4f81748b

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

+9 −2
Original line number Diff line number Diff line
@@ -338,6 +338,7 @@ public class NotificationPanelViewController extends PanelViewController { 
    private boolean mAnimateNextPositionUpdate;

    private float mQuickQsHeaderHeight;

    private ScreenOffAnimationController mScreenOffAnimationController;

    private UnlockedScreenOffAnimationController mUnlockedScreenOffAnimationController;



    private int mTrackingPointer;

    private VelocityTracker mQsVelocityTracker;
@@ -745,7 +746,8 @@ public class NotificationPanelViewController extends PanelViewController { 
            KeyguardUnlockAnimationController keyguardUnlockAnimationController,

            NotificationListContainer notificationListContainer,

            PanelEventsEmitter panelEventsEmitter,

            NotificationStackSizeCalculator notificationStackSizeCalculator) {

            NotificationStackSizeCalculator notificationStackSizeCalculator,

            UnlockedScreenOffAnimationController unlockedScreenOffAnimationController) {

        super(view,

                falsingManager,

                dozeLog,
@@ -846,6 +848,7 @@ public class NotificationPanelViewController extends PanelViewController { 
        mAuthController = authController;

        mLockIconViewController = lockIconViewController;

        mScreenOffAnimationController = screenOffAnimationController;

        mUnlockedScreenOffAnimationController = unlockedScreenOffAnimationController;

        mRemoteInputManager = remoteInputManager;



        int currentMode = navigationModeController.addListener(
@@ -1251,6 +1254,10 @@ public class NotificationPanelViewController extends PanelViewController { 
        }

    }



    private boolean shouldAvoidChangingNotificationsCount() {

        return mHintAnimationRunning || mUnlockedScreenOffAnimationController.isAnimationPlaying();

    }



    public void setKeyguardIndicationController(KeyguardIndicationController indicationController) {

        mKeyguardIndicationController = indicationController;

        mKeyguardIndicationController.setIndicationArea(mKeyguardBottomArea);
@@ -4733,7 +4740,7 @@ public class NotificationPanelViewController extends PanelViewController { 
                int oldTop, int oldRight, int oldBottom) {

            DejankUtils.startDetectingBlockingIpcs("NVP#onLayout");

            super.onLayoutChange(v, left, top, right, bottom, oldLeft, oldTop, oldRight, oldBottom);

            updateMaxDisplayedNotifications(true);

            updateMaxDisplayedNotifications(!shouldAvoidChangingNotificationsCount());

            setIsFullWidth(mNotificationStackScrollLayoutController.getWidth() == mView.getWidth());



            // Update Clock Pivot

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

+4 −1
Original line number Diff line number Diff line
@@ -331,6 +331,8 @@ public class NotificationPanelViewControllerTest extends SysuiTestCase { 
    private NotificationListContainer mNotificationListContainer;

    @Mock

    private NotificationStackSizeCalculator mNotificationStackSizeCalculator;

    @Mock

    private UnlockedScreenOffAnimationController mUnlockedScreenOffAnimationController;

    private NotificationPanelViewController.PanelEventsEmitter mPanelEventsEmitter;

    private Optional<SysUIUnfoldComponent> mSysUIUnfoldComponent = Optional.empty();

    private SysuiStatusBarStateController mStatusBarStateController;
@@ -511,7 +513,8 @@ public class NotificationPanelViewControllerTest extends SysuiTestCase { 
                mKeyguardUnlockAnimationController,

                mNotificationListContainer,

                mPanelEventsEmitter,

                mNotificationStackSizeCalculator);

                mNotificationStackSizeCalculator,

                mUnlockedScreenOffAnimationController);

        mNotificationPanelViewController.initDependencies(

                mCentralSurfaces,

                () -> {},