From d3f2dc954f10763e4eb02c1c0480b789a1bfccbb Mon Sep 17 00:00:00 2001
From: Bryce Lee <brycelee@google.com>
Date: Wed, 2 Mar 2022 21:17:05 +0000
Subject: [PATCH] Revert "Change default showClockAndComplications to false."

This reverts commit ae8b96964c45414f08868f7ca727507637440e13.

Reason for revert: causes overlay elements to not appear.

Test: manual
Bug: 222307681
Change-Id: I2d1f55227774a39f4b2dbe927ddd3aa1a5178351
---
 core/java/android/service/dreams/DreamService.java        | 2 +-
 .../android/systemui/dreams/DreamOverlayServiceTest.java  | 8 ++++----
 .../systemui/dreams/DreamOverlayStateControllerTest.java  | 1 -
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/core/java/android/service/dreams/DreamService.java b/core/java/android/service/dreams/DreamService.java
index 86707598255d6..db622d39b7859 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 = false;
+    public static final boolean DEFAULT_SHOW_COMPLICATIONS = true;
 
     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 b3d54590dc99a..35fda1392512e 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/dreams/DreamOverlayServiceTest.java
+++ b/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
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 3ce9889571f19..49da4bd5a8258 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/dreams/DreamOverlayStateControllerTest.java
+++ b/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);