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

Commit 19bb68b6 authored by Hawkwood Glazier's avatar Hawkwood Glazier Committed by Automerger Merge Worker
Browse files

Merge "Initialize Clock Size from NotificationPanelViewController" into... 

Merge "Initialize Clock Size from NotificationPanelViewController" into tm-qpr-dev am: 5db8d1ea am: d2ec6359

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



Change-Id: I8a591c60f1f07a01f16f76212d6e5ab842506f36
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 44181409 d2ec6359

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

+2 −1
Original line number Diff line number Diff line
@@ -915,6 +915,7 @@ public final class NotificationPanelViewController implements Dumpable { 
        mQsFrameTranslateController = qsFrameTranslateController;

        updateUserSwitcherFlags();

        mKeyguardBottomAreaViewModel = keyguardBottomAreaViewModel;

        mKeyguardBottomAreaInteractor = keyguardBottomAreaInteractor;

        onFinishInflate();

        keyguardUnlockAnimationController.addKeyguardUnlockAnimationListener(

                new KeyguardUnlockAnimationController.KeyguardUnlockAnimationListener() {
@@ -932,7 +933,6 @@ public final class NotificationPanelViewController implements Dumpable { 
                        unlockAnimationStarted(playingCannedAnimation, isWakeAndUnlock, startDelay);

                    }

                });

        mKeyguardBottomAreaInteractor = keyguardBottomAreaInteractor;

        dumpManager.registerDumpable(this);

    }
@@ -1108,6 +1108,7 @@ public final class NotificationPanelViewController implements Dumpable { 
                mKeyguardStatusViewComponentFactory.build(keyguardStatusView);

        mKeyguardStatusViewController = statusViewComponent.getKeyguardStatusViewController();

        mKeyguardStatusViewController.init();

        updateClockAppearance();



        if (mKeyguardUserSwitcherController != null) {

            // Try to close the switcher so that callbacks are triggered if necessary.

packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutController.java

+4 −2
Original line number Diff line number Diff line
@@ -983,7 +983,7 @@ public class NotificationStackScrollLayoutController { 
    }



    public boolean isAddOrRemoveAnimationPending() {

        return mView.isAddOrRemoveAnimationPending();

        return mView != null && mView.isAddOrRemoveAnimationPending();

    }



    public int getVisibleNotificationCount() {
@@ -1140,8 +1140,10 @@ public class NotificationStackScrollLayoutController { 
    }



    public void setAlpha(float alpha) {

        if (mView != null) {

            mView.setAlpha(alpha);

        }

    }



    public float calculateAppearFraction(float height) {

        return mView.calculateAppearFraction(height);

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

+8 −4
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ import static org.mockito.Mockito.doAnswer; 
import static org.mockito.Mockito.inOrder;

import static org.mockito.Mockito.mock;

import static org.mockito.Mockito.never;

import static org.mockito.Mockito.reset;

import static org.mockito.Mockito.times;

import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.when;
@@ -530,6 +531,8 @@ public class NotificationPanelViewControllerTest extends SysuiTestCase { 
                .setHeadsUpAppearanceController(mock(HeadsUpAppearanceController.class));

        verify(mNotificationStackScrollLayoutController)

                .setOnEmptySpaceClickListener(mEmptySpaceClickListenerCaptor.capture());

        verify(mKeyguardStatusViewController).displayClock(LARGE, /* animate */ true);

        reset(mKeyguardStatusViewController);

    }



    @After
@@ -609,7 +612,7 @@ public class NotificationPanelViewControllerTest extends SysuiTestCase { 


    @Test

    public void getVerticalSpaceForLockscreenNotifications_useLockIconBottomPadding_returnsSpaceAvailable() {

        setBottomPadding(/* stackScrollLayoutBottom= */ 100,

        setBottomPadding(/* stackScrollLayoutBottom= */ 180,

                /* lockIconPadding= */ 20,

                /* indicationPadding= */ 0,

                /* ambientPadding= */ 0);
@@ -620,7 +623,7 @@ public class NotificationPanelViewControllerTest extends SysuiTestCase { 


    @Test

    public void getVerticalSpaceForLockscreenNotifications_useIndicationBottomPadding_returnsSpaceAvailable() {

        setBottomPadding(/* stackScrollLayoutBottom= */ 100,

        setBottomPadding(/* stackScrollLayoutBottom= */ 180,

                /* lockIconPadding= */ 0,

                /* indicationPadding= */ 30,

                /* ambientPadding= */ 0);
@@ -631,7 +634,7 @@ public class NotificationPanelViewControllerTest extends SysuiTestCase { 


    @Test

    public void getVerticalSpaceForLockscreenNotifications_useAmbientBottomPadding_returnsSpaceAvailable() {

        setBottomPadding(/* stackScrollLayoutBottom= */ 100,

        setBottomPadding(/* stackScrollLayoutBottom= */ 180,

                /* lockIconPadding= */ 0,

                /* indicationPadding= */ 0,

                /* ambientPadding= */ 40);
@@ -954,7 +957,7 @@ public class NotificationPanelViewControllerTest extends SysuiTestCase { 
    }



    @Test

    public void testFinishInflate_userSwitcherDisabled_doNotInflateUserSwitchView() {

    public void testFinishInflate_userSwitcherDisabled_doNotInflateUserSwitchView_initClock() {

        givenViewAttached();

        when(mResources.getBoolean(

                com.android.internal.R.bool.config_keyguardUserSwitcher)).thenReturn(true);
@@ -965,6 +968,7 @@ public class NotificationPanelViewControllerTest extends SysuiTestCase { 
        mNotificationPanelViewController.onFinishInflate();



        verify(mUserSwitcherStubView, never()).inflate();

        verify(mKeyguardStatusViewController, times(3)).displayClock(LARGE, /* animate */ true);

    }



    @Test