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

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

Browse Source
This commit is contained in:
Darrell Shi
2022-03-09 17:00:35 +00:00
committed by Android (Google) Code Review
parent 60c89a2fdf 008d1da7f5
commit 485e5e223c
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

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

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

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

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