Merge "Revert "Change default showClockAndComplications to false."" into tm-dev (1e71fa64) · Commits · e / os / android_frameworks_base

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());

+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

+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);