From d11e77d3246d60708c82480c1f005f7f53d59122 Mon Sep 17 00:00:00 2001 From: Lucas Dupin Date: Thu, 11 Jan 2018 11:48:44 -0800 Subject: [PATCH] Don't show album art on AOD Fixes: 71767554 Test: Set AOD wallpaper, play media, look at AOD Change-Id: I8f53b1738cc18ecf07c69cfa193d80c6729593e0 --- .../com/android/systemui/statusbar/phone/StatusBar.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java index 2da1e4d108b4f..bc5440d116151 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java @@ -1596,7 +1596,7 @@ public class StatusBar extends SystemUI implements DemoMode, final boolean hasArtwork = artworkDrawable != null; - if ((hasArtwork || DEBUG_MEDIA_FAKE_ARTWORK) + if ((hasArtwork || DEBUG_MEDIA_FAKE_ARTWORK) && !mDozing && (mState != StatusBarState.SHADE || allowWhenShade) && mFingerprintUnlockController.getMode() != FingerprintUnlockController.MODE_WAKE_AND_UNLOCK_PULSING @@ -1657,15 +1657,16 @@ public class StatusBar extends SystemUI implements DemoMode, } } } else { - // need to hide the album art, either because we are unlocked or because - // the metadata isn't there to support it + // need to hide the album art, either because we are unlocked, on AOD + // or because the metadata isn't there to support it if (mBackdrop.getVisibility() != View.GONE) { if (DEBUG_MEDIA) { Log.v(TAG, "DEBUG_MEDIA: Fading out album artwork"); } + boolean cannotAnimateDoze = mDozing && !ScrimState.AOD.getAnimateChange(); if (mFingerprintUnlockController.getMode() == FingerprintUnlockController.MODE_WAKE_AND_UNLOCK_PULSING - || hideBecauseOccluded) { + || hideBecauseOccluded || cannotAnimateDoze) { // We are unlocking directly - no animation! mBackdrop.setVisibility(View.GONE);