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

Commit 4a11e9c1 authored by Lucas Silva's avatar Lucas Silva Committed by Automerger Merge Worker
Browse files

Merge "Don't show home controls complication if not available." into udc-dev am: 66a64d23 

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



Change-Id: I311f04f8aecc811a727bcfb8193ab4bc67b45868
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 10679abb 66a64d23

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

+2 −1
Original line number Original line Diff line number Diff line
@@ -199,7 +199,8 @@ public class DreamOverlayStateController implements 
                    if (mShouldShowComplications) {

                    if (mShouldShowComplications) {

                        return (requiredTypes & getAvailableComplicationTypes()) == requiredTypes;

                        return (requiredTypes & getAvailableComplicationTypes()) == requiredTypes;

                    }

                    }

                    return (requiredTypes & mSupportedTypes) == requiredTypes;

                    final int typesToAlwaysShow = mSupportedTypes & getAvailableComplicationTypes();

                    return (requiredTypes & typesToAlwaysShow) == requiredTypes;

                })

                })

                .collect(Collectors.toCollection(HashSet::new))

                .collect(Collectors.toCollection(HashSet::new))

                : mComplications);

                : mComplications);

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

+28 −0
Original line number Original line Diff line number Diff line
@@ -376,6 +376,34 @@ public class DreamOverlayStateControllerTest extends SysuiTestCase { 
        }

        }

    }

    }





    @Test

    public void testHomeControlsDoNotShowIfNotAvailable_featureEnabled() {

        when(mFeatureFlags.isEnabled(Flags.ALWAYS_SHOW_HOME_CONTROLS_ON_DREAMS)).thenReturn(true);



        final DreamOverlayStateController stateController = getDreamOverlayStateController(true);

        stateController.setShouldShowComplications(true);



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

        when(homeControlsComplication.getRequiredTypeAvailability())

                .thenReturn(Complication.COMPLICATION_TYPE_HOME_CONTROLS);



        stateController.addComplication(homeControlsComplication);



        final DreamOverlayStateController.Callback callback =

                Mockito.mock(DreamOverlayStateController.Callback.class);



        stateController.addCallback(callback);

        mExecutor.runAllReady();



        // No home controls since it is not available.

        assertThat(stateController.getComplications()).doesNotContain(homeControlsComplication);



        stateController.setAvailableComplicationTypes(Complication.COMPLICATION_TYPE_HOME_CONTROLS

                | Complication.COMPLICATION_TYPE_WEATHER);

        mExecutor.runAllReady();

        assertThat(stateController.getComplications()).contains(homeControlsComplication);

    }



    private DreamOverlayStateController getDreamOverlayStateController(boolean overlayEnabled) {

    private DreamOverlayStateController getDreamOverlayStateController(boolean overlayEnabled) {

        return new DreamOverlayStateController(mExecutor, overlayEnabled, mFeatureFlags);

        return new DreamOverlayStateController(mExecutor, overlayEnabled, mFeatureFlags);

    }

    }