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

Commit d7f491f7 authored by William Xiao's avatar William Xiao Committed by Android (Google) Code Review
Browse files

Merge changes from topic "presubmit-am-57d52d57ff4341f4a6a8262caebf7e00" into tm-qpr-dev-plus-aosp 

* changes:
  [automerge] Fix home controls showing on low light dream 2p: f501b295
  Fix home controls showing on low light dream
parents 68bd9b79 82640ba9

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

+4 −0
Original line number Diff line number Diff line
@@ -182,6 +182,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()

packages/SystemUI/tests/src/com/android/systemui/dreams/DreamOverlayStateControllerTest.java

+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);