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

Merge changes from topic "presubmit-am-57d52d57ff4341f4a6a8262caebf7e00" into tm-qpr-dev-plus-aosp am: d7f491f784 am: ba518571ec

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22599030

Change-Id: Ifc33f96fe73a2362fa65995aa7586060b76df9b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
William Xiao
2023-04-13 22:52:28 +00:00
committed by Automerger Merge Worker
parent 3895ea2419 ba518571ec
commit d21cc63782
2 changed files with 21 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/SystemUI/src/com/android/systemui/dreams/DreamOverlayStateController.java
View File

@@ -184,6 +184,10 @@ public class DreamOverlayStateController implements
* Returns collection of present {@link Complication}. * Returns collection of present {@link Complication}.
*/ */
public Collection<Complication> getComplications(boolean filterByAvailability) { public Collection<Complication> getComplications(boolean filterByAvailability) {
if (isLowLightActive()) {
// Don't show complications on low light.
return Collections.emptyList();
}
return Collections.unmodifiableCollection(filterByAvailability return Collections.unmodifiableCollection(filterByAvailability
? mComplications ? mComplications
.stream() .stream()

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

@@ -234,6 +234,23 @@ public class DreamOverlayStateControllerTest extends SysuiTestCase {
.isTrue(); .isTrue();
} }
@Test
public void testComplicationsNotShownForLowLight() {
final Complication complication = Mockito.mock(Complication.class);
final DreamOverlayStateController stateController = getDreamOverlayStateController(true);
// Add a complication and verify it's returned in getComplications.
stateController.addComplication(complication);
mExecutor.runAllReady();
assertThat(stateController.getComplications().contains(complication))
.isTrue();
stateController.setLowLightActive(true);
mExecutor.runAllReady();
assertThat(stateController.getComplications()).isEmpty();
}
@Test @Test
public void testNotifyLowLightChanged() { public void testNotifyLowLightChanged() {
final DreamOverlayStateController stateController = getDreamOverlayStateController(true); final DreamOverlayStateController stateController = getDreamOverlayStateController(true);