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

Commit 552e7782 authored by Darrell Shi's avatar Darrell Shi Committed by Automerger Merge Worker
Browse files

Merge "Add smartspace complication even when targets empty." into tm-qpr-dev... 

Merge "Add smartspace complication even when targets empty." into tm-qpr-dev am: 8e4783d3 am: 98058535

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19759403



Change-Id: I72c12996abdd03d6942e6120942d04ac3d26d90b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 09970117 98058535

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