diff options
2 files changed, 7 insertions, 19 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/dreams/complication/SmartSpaceComplication.java b/packages/SystemUI/src/com/android/systemui/dreams/complication/SmartSpaceComplication.java index 567bdbc01170..a981f255a873 100644 --- a/packages/SystemUI/src/com/android/systemui/dreams/complication/SmartSpaceComplication.java +++ b/packages/SystemUI/src/com/android/systemui/dreams/complication/SmartSpaceComplication.java @@ -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); - } + mDreamOverlayStateController.addComplication(mComplication); } }; diff --git a/packages/SystemUI/tests/src/com/android/systemui/dreams/complication/SmartSpaceComplicationTest.java b/packages/SystemUI/tests/src/com/android/systemui/dreams/complication/SmartSpaceComplicationTest.java index 7d54758acee7..fa8f88a08368 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/dreams/complication/SmartSpaceComplicationTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/dreams/complication/SmartSpaceComplicationTest.java @@ -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) @@ -61,9 +61,6 @@ public class SmartSpaceComplicationTest extends SysuiTestCase { private SmartSpaceComplication mComplication; @Mock - private ComplicationViewModel mComplicationViewModel; - - @Mock private View mBcSmartspaceView; @Before @@ -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 |