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

Commit 9c0df5a8 authored by Xiaowen Lei's avatar Xiaowen Lei Committed by Automerger Merge Worker
Browse files

Merge "Animate top padding of notifications on status view height change."... 

Merge "Animate top padding of notifications on status view height change." into udc-qpr-dev am: ee5c6994 am: 66833b21

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



Change-Id: Icdcb1d8642da58765657ed1355f0dced4127d309
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8bd10df1 66833b21

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

+7 −0
Original line number Diff line number Diff line
@@ -1243,6 +1243,13 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump 
            mKeyguardStatusViewController.init();

        }

        mKeyguardStatusViewController.setSplitShadeEnabled(mSplitShadeEnabled);

        mKeyguardStatusViewController.getView().addOnLayoutChangeListener(

                (v, left, top, right, bottom, oldLeft, oldTop, oldRight, oldBottom) -> {

                    int oldHeight = oldBottom - oldTop;

                    if (v.getHeight() != oldHeight) {

                        mNotificationStackScrollLayoutController.animateNextTopPaddingChange();

                    }

                });



        updateClockAppearance();

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

+17 −0
Original line number Diff line number Diff line
@@ -538,6 +538,23 @@ public class NotificationPanelViewControllerTest extends NotificationPanelViewCo 
        assertKeyguardStatusViewCentered();

    }



    @Test

    public void onKeyguardStatusViewHeightChange_animatesNextTopPaddingChangeForNSSL() {

        ArgumentCaptor<View.OnLayoutChangeListener> captor =

                ArgumentCaptor.forClass(View.OnLayoutChangeListener.class);

        verify(mKeyguardStatusView).addOnLayoutChangeListener(captor.capture());

        View.OnLayoutChangeListener listener = captor.getValue();



        clearInvocations(mNotificationStackScrollLayoutController);



        when(mKeyguardStatusView.getHeight()).thenReturn(0);

        listener.onLayoutChange(mKeyguardStatusView, /* left= */ 0, /* top= */ 0, /* right= */

                0, /* bottom= */ 0, /* oldLeft= */ 0, /* oldTop= */ 0, /* oldRight= */

                0, /* oldBottom = */ 200);



        verify(mNotificationStackScrollLayoutController).animateNextTopPaddingChange();

    }



    @Test

    public void testCanCollapsePanelOnTouch_trueForKeyGuard() {

        mStatusBarStateController.setState(KEYGUARD);