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

Commit c12e4603 authored Dec 16, 2019 by Jerry Chang

Timeout aod wallpaper while docking

Bug: 140915138
Test: atest SystemUITests:ScrimControllerTest
Change-Id: I1b374f87d863ac0fdfb9dd9e6c0ebc4615a91e80

parent 247901bb

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

+2 −1

Original line number	Diff line number	Diff line
		@@ -360,7 +360,8 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, OnCo
		return false;
		}

		if (mState == ScrimState.AOD && mDozeParameters.getAlwaysOn()) {
		if (mState == ScrimState.AOD
		&& (mDozeParameters.getAlwaysOn() \|\| mDockManager.isDocked())) {
		return true;
		}

packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/ScrimControllerTest.java

+11 −0

Original line number	Diff line number	Diff line
		@@ -759,6 +759,17 @@ public class ScrimControllerTest extends SysuiTestCase {
		verify(mAlarmManager).cancel(any(AlarmManager.OnAlarmListener.class));
		}

		@Test
		public void testWillHideDockedWallpaper() {
		mAlwaysOnEnabled = false;
		when(mDockManager.isDocked()).thenReturn(true);
		mScrimController.setWallpaperSupportsAmbientMode(true);

		mScrimController.transitionTo(ScrimState.AOD);

		verify(mAlarmManager).setExact(anyInt(), anyLong(), any(), any(), any());
		}

		@Test
		public void testConservesExpansionOpacityAfterTransition() {
		mScrimController.transitionTo(ScrimState.UNLOCKED);