Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change default showClockAndComplications to false.

Browse Source 
This makes sure existing behaviors don't change, and only dreams that
specify show dream overlay complications get them.

Test: atest DreamOverlayServiceTest
Bug: 214456383
Fix: 214456383
Change-Id: I5c94484d5af592159a07257137a138e41d0c6b53
This commit is contained in:
Darrell Shi
2022-02-18 23:00:06 +00:00
parent f78e5ab3bf
commit ae8b96964c
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/service/dreams/DreamService.java
View File

@@ -219,7 +219,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());

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

@@ -147,19 +147,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

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

@@ -126,6 +126,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);