Merge "Merge changes from topic... (c3199828) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/dreams/DreamOverlayStateController.java

+4 −0

Original line number	Diff line number	Diff line
		@@ -184,6 +184,10 @@ public class DreamOverlayStateController implements
		* Returns collection of present {@link Complication}.
		*/
		public Collection<Complication> getComplications(boolean filterByAvailability) {
		if (isLowLightActive()) {
		// Don't show complications on low light.
		return Collections.emptyList();
		}
		return Collections.unmodifiableCollection(filterByAvailability
		? mComplications
		.stream()

+17 −0

Original line number	Diff line number	Diff line
		@@ -234,6 +234,23 @@ public class DreamOverlayStateControllerTest extends SysuiTestCase {
		.isTrue();
		}

		@Test
		public void testComplicationsNotShownForLowLight() {
		final Complication complication = Mockito.mock(Complication.class);
		final DreamOverlayStateController stateController = getDreamOverlayStateController(true);

		// Add a complication and verify it's returned in getComplications.
		stateController.addComplication(complication);
		mExecutor.runAllReady();
		assertThat(stateController.getComplications().contains(complication))
		.isTrue();

		stateController.setLowLightActive(true);
		mExecutor.runAllReady();

		assertThat(stateController.getComplications()).isEmpty();
		}

		@Test
		public void testNotifyLowLightChanged() {
		final DreamOverlayStateController stateController = getDreamOverlayStateController(true);