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

Commit 25f7b999 authored by Bryce Lee's avatar Bryce Lee Committed by Automerger Merge Worker
Browse files

Merge "Revert "Change default showClockAndComplications to false."" into tm-dev am: 1e71fa64 

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

Change-Id: I34284728be7265971668149e46019d86fd6c6776
parents b1197404 1e71fa64

core/java/android/service/dreams/DreamService.java

+1 −1
Original line number Diff line number Diff line
@@ -231,7 +231,7 @@ public class DreamService extends Service implements Window.Callback { 
     * The default value for whether to show complications on the overlay.

     * @hide

     */

    public static final boolean DEFAULT_SHOW_COMPLICATIONS = false;

    public static final boolean DEFAULT_SHOW_COMPLICATIONS = true;



    private final IDreamManager mDreamManager;

    private final Handler mHandler = new Handler(Looper.getMainLooper());

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

+4 −4
Original line number Diff line number Diff line
@@ -173,19 +173,19 @@ public class DreamOverlayServiceTest extends SysuiTestCase { 
    }



    @Test

    public void testShouldShowComplicationsFalseByDefault() {

    public void testShouldShowComplicationsTrueByDefault() {

        mService.onBind(new Intent());



        assertThat(mService.shouldShowComplications()).isFalse();

        assertThat(mService.shouldShowComplications()).isTrue();

    }



    @Test

    public void testShouldShowComplicationsSetByIntentExtra() {

        final Intent intent = new Intent();

        intent.putExtra(DreamService.EXTRA_SHOW_COMPLICATIONS, true);

        intent.putExtra(DreamService.EXTRA_SHOW_COMPLICATIONS, false);

        mService.onBind(intent);



        assertThat(mService.shouldShowComplications()).isTrue();

        assertThat(mService.shouldShowComplications()).isFalse();

    }



    @Test

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

+0 −1
Original line number Diff line number Diff line
@@ -158,7 +158,6 @@ public class DreamOverlayStateControllerTest extends SysuiTestCase { 
    public void testComplicationFilteringWhenShouldShowComplications() {

        final DreamOverlayStateController stateController =

                new DreamOverlayStateController(mExecutor);

        stateController.setShouldShowComplications(true);



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

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