diff options
3 files changed, 14 insertions, 7 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java b/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java index 6f71b7278edd..3b40aebbc7a4 100644 --- a/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java +++ b/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java @@ -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. diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutController.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutController.java index e3336b269ca1..2d6d0a9cbeca 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutController.java @@ -983,7 +983,7 @@ public class NotificationStackScrollLayoutController { } public boolean isAddOrRemoveAnimationPending() { - return mView.isAddOrRemoveAnimationPending(); + return mView != null && mView.isAddOrRemoveAnimationPending(); } public int getVisibleNotificationCount() { @@ -1140,7 +1140,9 @@ public class NotificationStackScrollLayoutController { } public void setAlpha(float alpha) { - mView.setAlpha(alpha); + if (mView != null) { + mView.setAlpha(alpha); + } } public float calculateAppearFraction(float height) { diff --git a/packages/SystemUI/tests/src/com/android/systemui/shade/NotificationPanelViewControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/shade/NotificationPanelViewControllerTest.java index 17ba30a301b3..56a840cae267 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/shade/NotificationPanelViewControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/shade/NotificationPanelViewControllerTest.java @@ -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 |