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

Commit 38df5710 authored by Bryce Lee's avatar Bryce Lee Committed by Android (Google) Code Review
Browse files

Merge "Do not filter MediaDreamComplication." into tm-qpr-dev

parents b22b0672 f303903a

packages/SystemUI/src/com/android/systemui/media/dream/MediaDreamComplication.java

+0 −5
Original line number Diff line number Diff line
@@ -36,11 +36,6 @@ public class MediaDreamComplication implements Complication { 
        mComponentFactory = componentFactory;

    }



    @Override

    public int getRequiredTypeAvailability() {

        return COMPLICATION_TYPE_CAST_INFO;

    }



    @Override

    public ViewHolder createView(ComplicationViewModel model) {

        return mComponentFactory.create().getViewHolder();

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

+11 −0
Original line number Diff line number Diff line
@@ -207,4 +207,15 @@ public class DreamOverlayStateControllerTest extends SysuiTestCase { 
            assertThat(complications.contains(weatherComplication)).isFalse();

        }

    }



    @Test

    public void testComplicationWithNoTypeNotFiltered() {

        final Complication complication = Mockito.mock(Complication.class);

        final DreamOverlayStateController stateController =

                new DreamOverlayStateController(mExecutor);

        stateController.addComplication(complication);

        mExecutor.runAllReady();

        assertThat(stateController.getComplications(true).contains(complication))

                .isTrue();

    }

}