Merge "Revert "Change default showClockAndComplications to false."" into tm-dev

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 = 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

@@ -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

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