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

Merge "Update scrims when keyguard gets occluded" into pi-dev am: cc4efe08de

Browse Source 
am: 7c66fae398

Change-Id: I64c0792cbbf4285e33032a4d3517d3529c072ba4
This commit is contained in:
Lucas Dupin
2018-06-07 10:48:19 -07:00
committed by android-build-merger
parent 383f8bdcbd 7c66fae398
commit c3403c547c
2 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java
View File

@@ -896,6 +896,7 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, OnCo
public void setKeyguardOccluded(boolean keyguardOccluded) {
mKeyguardOccluded = keyguardOccluded;
updateScrims();
}
public interface Callback {

12
packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/ScrimControllerTest.java
View File

@@ -541,6 +541,18 @@ public class ScrimControllerTest extends SysuiTestCase {
assertScrimVisibility(VISIBILITY_FULLY_TRANSPARENT, VISIBILITY_FULLY_OPAQUE);
}
@Test
public void testHidesShowWhenLockedActivity_whenAlreadyInAod() {
mScrimController.setWallpaperSupportsAmbientMode(true);
mScrimController.transitionTo(ScrimState.AOD);
mScrimController.finishAnimationsImmediately();
assertScrimVisibility(VISIBILITY_FULLY_TRANSPARENT, VISIBILITY_FULLY_TRANSPARENT);
mScrimController.setKeyguardOccluded(true);
mScrimController.finishAnimationsImmediately();
assertScrimVisibility(VISIBILITY_FULLY_TRANSPARENT, VISIBILITY_FULLY_OPAQUE);
}
@Test
public void testEatsTouchEvent() {
HashSet<ScrimState> eatsTouches =