From e7d7d572a36514b3a6d80f4c4b14b1cf7409d9e8 Mon Sep 17 00:00:00 2001 From: Vadim Tryshev Date: Wed, 9 Mar 2016 16:44:30 -0800 Subject: [PATCH] Setting mBackdropBack to null if artwork isn't available. Otherwise, it preserves the old image. Later, mBackdropFront will get this image and try fading from it. This will suddenly flash the old image. Bug: 25185253 Change-Id: I702e73684e692712edf48ce31c152c5f5a8bffdb --- .../com/android/systemui/statusbar/phone/PhoneStatusBar.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java index 03cdcb2d77288..2fdd6421d9101 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java @@ -1946,6 +1946,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, // We are unlocking directly - no animation! mBackdrop.setVisibility(View.GONE); + mBackdropBack.setImageDrawable(null); } else { mBackdrop.animate() // Never let the alpha become zero - otherwise the RenderNode @@ -1961,7 +1962,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, public void run() { mBackdrop.setVisibility(View.GONE); mBackdropFront.animate().cancel(); - mBackdropBack.animate().cancel(); + mBackdropBack.setImageDrawable(null); mHandler.post(mHideBackdropFront); } });