diff options
3 files changed, 6 insertions, 5 deletions
diff --git a/core/java/android/service/dreams/DreamService.java b/core/java/android/service/dreams/DreamService.java index db622d39b785..86707598255d 100644 --- a/core/java/android/service/dreams/DreamService.java +++ b/core/java/android/service/dreams/DreamService.java @@ -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 = true; + public static final boolean DEFAULT_SHOW_COMPLICATIONS = false; private final IDreamManager mDreamManager; private final Handler mHandler = new Handler(Looper.getMainLooper()); diff --git a/packages/SystemUI/tests/src/com/android/systemui/dreams/DreamOverlayServiceTest.java b/packages/SystemUI/tests/src/com/android/systemui/dreams/DreamOverlayServiceTest.java index 21768edd40e9..2860b50c2295 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/dreams/DreamOverlayServiceTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/dreams/DreamOverlayServiceTest.java @@ -152,19 +152,19 @@ public class DreamOverlayServiceTest extends SysuiTestCase { } @Test - public void testShouldShowComplicationsTrueByDefault() { + public void testShouldShowComplicationsFalseByDefault() { mService.onBind(new Intent()); - assertThat(mService.shouldShowComplications()).isTrue(); + assertThat(mService.shouldShowComplications()).isFalse(); } @Test public void testShouldShowComplicationsSetByIntentExtra() { final Intent intent = new Intent(); - intent.putExtra(DreamService.EXTRA_SHOW_COMPLICATIONS, false); + intent.putExtra(DreamService.EXTRA_SHOW_COMPLICATIONS, true); mService.onBind(intent); - assertThat(mService.shouldShowComplications()).isFalse(); + assertThat(mService.shouldShowComplications()).isTrue(); } @Test diff --git a/packages/SystemUI/tests/src/com/android/systemui/dreams/DreamOverlayStateControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/dreams/DreamOverlayStateControllerTest.java index 49da4bd5a825..3ce9889571f1 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/dreams/DreamOverlayStateControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/dreams/DreamOverlayStateControllerTest.java @@ -158,6 +158,7 @@ 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); |