Merge "Propagate status bar state to NSSL on reattach" into tm-qpr-dev (1d810ad9) · Commits · e / os / android_frameworks_base

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

+5 −1

Original line number	Diff line number	Diff line
		@@ -209,7 +209,11 @@ public class NotificationStackScrollLayoutController {
		public void onViewAttachedToWindow(View v) {
		mConfigurationController.addCallback(mConfigurationListener);
		mZenModeController.addCallback(mZenModeControllerCallback);
		mBarState = mStatusBarStateController.getState();
		final int newBarState = mStatusBarStateController.getState();
		if (newBarState != mBarState) {
		mStateListener.onStateChanged(newBarState);
		mStateListener.onStatePostChange();
		}
		mStatusBarStateController.addCallback(
		mStateListener, SysuiStatusBarStateController.RANK_STACK_SCROLLER);
		}

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

+31 −0

Original line number	Diff line number	Diff line
		@@ -413,6 +413,37 @@ public class NotificationStackScrollLayoutControllerTest extends SysuiTestCase {
		verify(mNotificationStackScrollLayout).updateEmptyShadeView(anyBoolean(), anyBoolean());
		}

		@Test
		public void testAttach_updatesViewStatusBarState() {
		// GIVEN: Controller is attached
		mController.attach(mNotificationStackScrollLayout);
		ArgumentCaptor<StatusBarStateController.StateListener> captor =
		ArgumentCaptor.forClass(StatusBarStateController.StateListener.class);
		verify(mSysuiStatusBarStateController).addCallback(captor.capture(), anyInt());
		StatusBarStateController.StateListener stateListener = captor.getValue();

		// WHEN: StatusBarState changes to SHADE
		when(mSysuiStatusBarStateController.getState()).thenReturn(SHADE);
		stateListener.onStateChanged(SHADE);

		// THEN: NSSL is updated with the current state
		verify(mNotificationStackScrollLayout).setStatusBarState(SHADE);

		// WHEN: Controller is detached
		mController.mOnAttachStateChangeListener
		.onViewDetachedFromWindow(mNotificationStackScrollLayout);

		// WHEN: StatusBarState changes to KEYGUARD
		when(mSysuiStatusBarStateController.getState()).thenReturn(KEYGUARD);

		// WHEN: Controller is re-attached
		mController.mOnAttachStateChangeListener
		.onViewAttachedToWindow(mNotificationStackScrollLayout);

		// THEN: NSSL is updated with the current state
		verify(mNotificationStackScrollLayout).setStatusBarState(KEYGUARD);
		}

		private LogMaker logMatcher(int category, int type) {
		return argThat(new LogMatcher(category, type));
		}