diff options
| author | d34d <clark@cyngn.com> | 2016-02-09 14:59:44 -0800 |
|---|---|---|
| committer | d34d <clark@cyngn.com> | 2016-02-12 10:56:38 -0800 |
| commit | 6deab5df979ee6881ea114a21b0d52316cfc89e5 (patch) | |
| tree | 04aa54dc41da208e480c9ecb96c6078e4d546113 /packages/SystemUI/src | |
| parent | 1d45972997c57ad539e946e59d357ca44df5d913 (diff) | |
| download | frameworks_base-6deab5df979ee6881ea114a21b0d52316cfc89e5.zip frameworks_base-6deab5df979ee6881ea114a21b0d52316cfc89e5.tar.gz frameworks_base-6deab5df979ee6881ea114a21b0d52316cfc89e5.tar.bz2 | |
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
Diffstat (limited to 'packages/SystemUI/src')
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java | 9 |
1 files changed, 3 insertions, 6 deletions
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; } |