Merge "On occlusion: use AUTH_SCRIMMED scrim state" into tm-qpr-dev (64d3a0e6) · Commits · e / os / android_frameworks_base

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

+3 −3

Original line number	Diff line number	Diff line
		@@ -3746,10 +3746,10 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces {

		boolean launchingAffordanceWithPreview = mLaunchingAffordance;
		mScrimController.setLaunchingAffordanceWithPreview(launchingAffordanceWithPreview);

		if (mAlternateBouncerInteractor.isVisibleState()) {
		if (mState == StatusBarState.SHADE \|\| mState == StatusBarState.SHADE_LOCKED
		\|\| mTransitionToFullShadeProgress > 0f) {
		if ((!isOccluded() \|\| isPanelExpanded())
		&& (mState == StatusBarState.SHADE \|\| mState == StatusBarState.SHADE_LOCKED
		\|\| mTransitionToFullShadeProgress > 0f)) {
		mScrimController.transitionTo(ScrimState.AUTH_SCRIMMED_SHADE);
		} else {
		mScrimController.transitionTo(ScrimState.AUTH_SCRIMMED);

+28 −0

Original line number	Diff line number	Diff line
		@@ -1035,6 +1035,34 @@ public class CentralSurfacesImplTest extends SysuiTestCase {
		verify(mStatusBarKeyguardViewManager).onKeyguardFadedAway();
		}

		@Test
		public void testOccludingQSNotExpanded_transitionToAuthScrimmed() {
		when(mAlternateBouncerInteractor.isVisibleState()).thenReturn(true);

		// GIVEN device occluded and panel is NOT expanded
		mCentralSurfaces.setBarStateForTest(SHADE); // occluding on LS has StatusBarState = SHADE
		when(mKeyguardStateController.isOccluded()).thenReturn(true);
		mCentralSurfaces.mPanelExpanded = false;

		mCentralSurfaces.updateScrimController();

		verify(mScrimController).transitionTo(eq(ScrimState.AUTH_SCRIMMED));
		}

		@Test
		public void testOccludingQSExpanded_transitionToAuthScrimmedShade() {
		when(mAlternateBouncerInteractor.isVisibleState()).thenReturn(true);

		// GIVEN device occluded and qs IS expanded
		mCentralSurfaces.setBarStateForTest(SHADE); // occluding on LS has StatusBarState = SHADE
		when(mKeyguardStateController.isOccluded()).thenReturn(true);
		mCentralSurfaces.mPanelExpanded = true;

		mCentralSurfaces.updateScrimController();

		verify(mScrimController).transitionTo(eq(ScrimState.AUTH_SCRIMMED_SHADE));
		}

		@Test
		public void testShowKeyguardImplementation_setsState() {
		when(mLockscreenUserManager.getCurrentProfiles()).thenReturn(new SparseArray<>());