Merge "Call dream overlay callback onWakeUp in dream overlay reset" into main (011c1d3c) · Commits · e / os / android_frameworks_base

packages/SystemUI/multivalentTests/src/com/android/systemui/dreams/DreamOverlayCallbackControllerTest.kt

+14 −0

Original line number	Diff line number	Diff line
		@@ -56,6 +56,7 @@ class DreamOverlayCallbackControllerTest : SysuiTestCase() {

		// Adding twice should not invoke twice
		reset(callback)
		underTest.onStartDream()
		underTest.addCallback(callback)
		underTest.onWakeUp()
		verify(callback, times(1)).onWakeUp()
		@@ -67,6 +68,19 @@ class DreamOverlayCallbackControllerTest : SysuiTestCase() {
		verify(callback, never()).onWakeUp()
		}

		@Test
		fun onWakeUp_multipleCalls() {
		underTest.onStartDream()
		assertThat(underTest.isDreaming).isEqualTo(true)

		underTest.addCallback(callback)
		underTest.onWakeUp()
		underTest.onWakeUp()
		underTest.onWakeUp()
		verify(callback, times(1)).onWakeUp()
		assertThat(underTest.isDreaming).isEqualTo(false)
		}

		@Test
		fun onStartDreamInvokesCallback() {
		underTest.addCallback(callback)

+3 −0

Original line number	Diff line number	Diff line
		@@ -712,6 +712,9 @@ class DreamOverlayServiceTest : SysuiTestCase() {

		// Verify DreamOverlayContainerViewController is destroyed.
		verify(mDreamOverlayContainerViewController).destroy()

		// DreamOverlay callback receives onWakeUp.
		verify(mDreamOverlayCallbackController).onWakeUp()
		}

		@Test

+4 −2

Original line number	Diff line number	Diff line
		@@ -39,9 +39,11 @@ class DreamOverlayCallbackController @Inject constructor() :
		}

		fun onWakeUp() {
		if (isDreaming) {
		isDreaming = false
		callbacks.forEach { it.onWakeUp() }
		}
		}

		fun onStartDream() {
		isDreaming = true

+2 −0

Original line number	Diff line number	Diff line
		@@ -297,6 +297,8 @@ public class DreamOverlayService extends android.service.dreams.DreamOverlayServ
		mStateController.setLowLightActive(false);
		mStateController.setEntryAnimationsFinished(false);

		mDreamOverlayCallbackController.onWakeUp();

		if (mDreamOverlayContainerViewController != null) {
		mDreamOverlayContainerViewController.destroy();
		mDreamOverlayContainerViewController = null;