commit | 4035ef585560ceed9a715ff22c7c154f16e9b0b0 | [log] [tgz] |
---|---|---|
author | Mady Mellor <madym@google.com> | Thu Jul 25 11:10:02 2019 -0700 |
committer | Mady Mellor <madym@google.com> | Thu Jul 25 11:26:03 2019 -0700 |
tree | f99624fbe804c9a1e6759e392e13572092f87d2e | |
parent | b4ad2fc13b3e3d389cc02da2d7a4c0743f14f80d [diff] | |
parent | bae4081329a714edde1d2ad060ff0c5c2244ddaf [diff] |
resolve merge conflicts of bae4081329a714edde1d2ad060ff0c5c2244ddaf to qt-r1-bubbles-dev Bug: None Test: atest ScrimControllerTest Change-Id: Ic4db2e08af5a34c78de5b451165b16facf354610
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java index a9a26f1..558aaad 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java
@@ -512,6 +512,8 @@ public void prepareForGentleWakeUp() { if (mState == ScrimState.AOD && mDozeParameters.getAlwaysOn()) { mInFrontAlpha = 1f; + mInFrontTint = Color.BLACK; + mBehindTint = Color.BLACK; mAnimateChange = false; updateScrims(); mAnimateChange = true;
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 3a4a264..f2d5112 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimState.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimState.java
@@ -142,7 +142,10 @@ mFrontAlpha = 0f; mBubbleAlpha = 0f; mBehindTint = Color.BLACK; + mFrontTint = Color.BLACK; mBlankScreen = mDisplayRequiresBlanking; + mAnimationDuration = mWakeLockScreenSensorActive + ? ScrimController.ANIMATION_DURATION_LONG : ScrimController.ANIMATION_DURATION; } @Override