Merge "Add smartspace complication even when targets empty." into tm-qpr-dev (8e4783d3) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/dreams/complication/SmartSpaceComplication.java

+1 −5

Original line number	Diff line number	Diff line
		@@ -70,11 +70,7 @@ public class SmartSpaceComplication implements Complication {
		new BcSmartspaceDataPlugin.SmartspaceTargetListener() {
		@Override
		public void onSmartspaceTargetsUpdated(List<? extends Parcelable> targets) {
		if (!targets.isEmpty()) {
		mDreamOverlayStateController.addComplication(mComplication);
		} else {
		mDreamOverlayStateController.removeComplication(mComplication);
		}
		}
		};

packages/SystemUI/tests/src/com/android/systemui/dreams/complication/SmartSpaceComplicationTest.java

+6 −14

Original line number	Diff line number	Diff line
		@@ -43,7 +43,7 @@ import org.mockito.Mock;
		import org.mockito.Mockito;
		import org.mockito.MockitoAnnotations;

		import java.util.Arrays;
		import java.util.Collections;

		@SmallTest
		@RunWith(AndroidTestingRunner.class)
		@@ -60,9 +60,6 @@ public class SmartSpaceComplicationTest extends SysuiTestCase {
		@Mock
		private SmartSpaceComplication mComplication;

		@Mock
		private ComplicationViewModel mComplicationViewModel;

		@Mock
		private View mBcSmartspaceView;

		@@ -125,12 +122,12 @@ public class SmartSpaceComplicationTest extends SysuiTestCase {

		// Test
		final SmartspaceTarget target = Mockito.mock(SmartspaceTarget.class);
		listenerCaptor.getValue().onSmartspaceTargetsUpdated(Arrays.asList(target));
		listenerCaptor.getValue().onSmartspaceTargetsUpdated(Collections.singletonList(target));
		verify(mDreamOverlayStateController).addComplication(eq(mComplication));
		}

		@Test
		public void testOverlayActive_targetsEmpty_removesComplication() {
		public void testOverlayActive_targetsEmpty_addsComplication() {
		final SmartSpaceComplication.Registrant registrant = getRegistrant();
		registrant.start();

		@@ -145,13 +142,9 @@ public class SmartSpaceComplicationTest extends SysuiTestCase {
		ArgumentCaptor.forClass(BcSmartspaceDataPlugin.SmartspaceTargetListener.class);
		verify(mSmartspaceController).addListener(listenerCaptor.capture());

		final SmartspaceTarget target = Mockito.mock(SmartspaceTarget.class);
		listenerCaptor.getValue().onSmartspaceTargetsUpdated(Arrays.asList(target));
		verify(mDreamOverlayStateController).addComplication(eq(mComplication));

		// Test
		listenerCaptor.getValue().onSmartspaceTargetsUpdated(Arrays.asList());
		verify(mDreamOverlayStateController).removeComplication(eq(mComplication));
		listenerCaptor.getValue().onSmartspaceTargetsUpdated(Collections.emptyList());
		verify(mDreamOverlayStateController).addComplication(eq(mComplication));
		}

		@Test
		@@ -170,8 +163,7 @@ public class SmartSpaceComplicationTest extends SysuiTestCase {
		ArgumentCaptor.forClass(BcSmartspaceDataPlugin.SmartspaceTargetListener.class);
		verify(mSmartspaceController).addListener(listenerCaptor.capture());

		final SmartspaceTarget target = Mockito.mock(SmartspaceTarget.class);
		listenerCaptor.getValue().onSmartspaceTargetsUpdated(Arrays.asList(target));
		listenerCaptor.getValue().onSmartspaceTargetsUpdated(Collections.emptyList());
		verify(mDreamOverlayStateController).addComplication(eq(mComplication));

		// Test