diff options
| author | Aleks Rozman <arozman@google.com> | 2020-03-08 15:03:06 -0700 |
|---|---|---|
| committer | Aleks Rozman <arozman@google.com> | 2020-03-08 23:14:56 +0000 |
| commit | 12c8c244a63113612c69d4970878e6722efdaab8 (patch) | |
| tree | 567ef8e86cfd09717fe675b9d445d5cbe24dfb90 /packages/SystemUI/src | |
| parent | e8788abc539e2936c78c112b499033d0a862a3e0 (diff) | |
| download | base-12c8c244a63113612c69d4970878e6722efdaab8.tar.gz | |
DO NOT MERGE: Resolve mBehindAlpha with mCurrentBehindAlpha
fixes a build breakage, mBehindAlpha is a master thing but mCurrentBehindAlpha is a QPR1 thing
BUG: 151041066
Test: Compile
Change-Id: I78d767319d2ba856a9f453f71b39ddd3c96e6b9f
Diffstat (limited to 'packages/SystemUI/src')
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java | 4 |
1 files changed, 2 insertions, 2 deletions
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 d9bb995c5da8..08ba50857fa7 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java @@ -473,9 +473,9 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, OnCo mCurrentBehindTint = ColorUtils.blendARGB(ScrimState.BOUNCER.getBehindTint(), mState.getBehindTint(), interpolatedFract); } - if (isNaN(mBehindAlpha) || isNaN(mInFrontAlpha)) { + if (isNaN(mCurrentBehindAlpha) || isNaN(mCurrentInFrontAlpha)) { throw new IllegalStateException("Scrim opacity is NaN for state: " + mState - + ", front: " + mInFrontAlpha + ", back: " + mBehindAlpha); + + ", front: " + mCurrentInFrontAlpha + ", back: " + mCurrentBehindAlpha); } } |