From 6deab5df979ee6881ea114a21b0d52316cfc89e5 Mon Sep 17 00:00:00 2001 From: d34d Date: Tue, 9 Feb 2016 14:59:44 -0800 Subject: SysUI: Don't show LS wallpaper if LLS is available If the user has a live lock screen enabled we should not show the static lock screen wallpaper. Change-Id: I7e509924b49c8acbc31d076f251f470da1eed8a6 TICKET: CYNGNOS-1963 --- .../src/com/android/systemui/statusbar/phone/PhoneStatusBar.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'packages/SystemUI/src') 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 9b3944d..ec0eb78 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java @@ -2144,11 +2144,6 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, } } - // apply user lockscreen image - if (mMediaMetadata == null && backdropBitmap == null) { - backdropBitmap = mKeyguardWallpaper; - } - // HACK: Consider keyguard as visible if showing sim pin security screen KeyguardUpdateMonitor updateMonitor = KeyguardUpdateMonitor.getInstance(mContext); boolean keyguardVisible = mState != StatusBarState.SHADE || updateMonitor.isSimPinSecure(); @@ -2162,7 +2157,9 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, == PlaybackState.STATE_PLAYING); } - if (backdropBitmap == null && mMediaMetadata == null) { + // apply user lockscreen image + if (backdropBitmap == null && mMediaMetadata == null && + !mNotificationPanel.hasExternalKeyguardView()) { backdropBitmap = mKeyguardWallpaper; } -- cgit v1.1