Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eb3315ce authored by d34d's avatar d34d Committed by Clark Scheff
Browse files

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
(cherry picked from commit 6deab5df)
parent d7357f90

packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java

+3 −6
Original line number Diff line number Diff line
@@ -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;

        }