diff options
| author | Mady Mellor <madym@google.com> | 2018-11-06 18:05:54 -0800 |
|---|---|---|
| committer | Mady Mellor <madym@google.com> | 2018-11-19 15:12:32 -0800 |
| commit | 0c333774c87f50db7cf7fb02fed577de7927d503 (patch) | |
| tree | 20e2dc37f932563ab00860af132b6eb4f23bfe13 | |
| parent | 2f01ed9a2ce480ae156f51826bec15ac041cde44 (diff) | |
Introduce scrim state for bubbles
When bubbles are expanded we'll want to put a scrim behind them, this
is the scrim state we'll use.
Super simple test to check that alpha / visibility state of scrims
are as expected
Test: atest frameworks/base/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/ScrimControllerTest.java
Bug: 111236845
Change-Id: I1ee8ff9e7ce35aae692cf75a912106255e0e9b5a
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimState.java | 14 | ||||
| -rw-r--r-- | packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/ScrimControllerTest.java | 13 |
2 files changed, 27 insertions, 0 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimState.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimState.java index ade063d9718f..98c61a80229a 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimState.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimState.java @@ -186,6 +186,20 @@ public enum ScrimState { mBlankScreen = false; } } + }, + + /** + * Unlocked with a bubble expanded. + */ + BUBBLE_EXPANDED(7) { + @Override + public void prepare(ScrimState previousState) { + mCurrentInFrontTint = Color.TRANSPARENT; + mCurrentBehindTint = Color.TRANSPARENT; + mAnimationDuration = ScrimController.ANIMATION_DURATION; + mCurrentBehindAlpha = ScrimController.GRADIENT_SCRIM_ALPHA_BUSY; + mBlankScreen = false; + } }; boolean mBlankScreen = false; diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/ScrimControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/ScrimControllerTest.java index 9c558748697a..0bc304ee41b2 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/ScrimControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/ScrimControllerTest.java @@ -263,6 +263,19 @@ public class ScrimControllerTest extends SysuiTestCase { } @Test + public void transitionToBubbleExpanded() { + mScrimController.transitionTo(ScrimState.BUBBLE_EXPANDED); + mScrimController.finishAnimationsImmediately(); + + // Front scrim should be transparent + Assert.assertEquals(ScrimController.VISIBILITY_FULLY_TRANSPARENT, + mScrimInFront.getViewAlpha(), 0.0f); + // Back scrim should be visible + Assert.assertEquals(ScrimController.GRADIENT_SCRIM_ALPHA_BUSY, + mScrimBehind.getViewAlpha(), 0.0f); + } + + @Test public void scrimStateCallback() { mScrimController.transitionTo(ScrimState.UNLOCKED); mScrimController.finishAnimationsImmediately(); |
