From 511f27066eb1b716d1a68ce458cafcd59df18937 Mon Sep 17 00:00:00 2001 From: Selim Cinek Date: Mon, 10 Apr 2017 19:53:01 -0700 Subject: [PATCH] Fixed a regression where the scrim would be black The scrim was initialized with full alpha, which is inconsistent with the initial state of the scrimcontroller. Test: manual, no security, kill systemui, get heads-up Change-Id: Id050f2f58750bacf296b29dc26fee49cdcbaaccb Fixes: 36387167 --- .../android/systemui/statusbar/phone/ScrimController.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 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 dadb749af2d0c..67d5b6a2959ee 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java @@ -57,6 +57,7 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, private static final int TAG_KEY_ANIM_TARGET = R.id.scrim_target; private static final int TAG_START_ALPHA = R.id.scrim_alpha_start; private static final int TAG_END_ALPHA = R.id.scrim_alpha_end; + private static final float NOT_INITIALIZED = -1; private final LightBarController mLightBarController; protected final ScrimView mScrimBehind; @@ -87,9 +88,9 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, private boolean mDozing; private float mDozeInFrontAlpha; private float mDozeBehindAlpha; - private float mCurrentInFrontAlpha; - private float mCurrentBehindAlpha; - private float mCurrentHeadsUpAlpha = 1; + private float mCurrentInFrontAlpha = NOT_INITIALIZED; + private float mCurrentBehindAlpha = NOT_INITIALIZED; + private float mCurrentHeadsUpAlpha = NOT_INITIALIZED; private int mPinnedHeadsUpCount; private float mTopHeadsUpDragAmount; private View mDraggedHeadsUpView; @@ -111,6 +112,7 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, mScrimBehindAlpha = context.getResources().getFloat(R.dimen.scrim_behind_alpha); updateHeadsUpScrim(false); + updateScrims(); } public void setKeyguardShowing(boolean showing) {