diff options
author | d34d <clark@cyngn.com> | 2016-02-12 13:29:34 -0800 |
---|---|---|
committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2016-02-18 09:02:48 -0800 |
commit | 0d7fd344265cb92d6a459fe9d07af10e6af6fba0 (patch) | |
tree | 33f06ac11db528af5651c6c8114105d07af1e61d /packages/SystemUI | |
parent | 7f7dc723f0c96f5a015799702d15d40274a07e21 (diff) | |
download | frameworks_base-0d7fd344265cb92d6a459fe9d07af10e6af6fba0.zip frameworks_base-0d7fd344265cb92d6a459fe9d07af10e6af6fba0.tar.gz frameworks_base-0d7fd344265cb92d6a459fe9d07af10e6af6fba0.tar.bz2 |
SysUI: Don't blur when showing a Live lock screen
Change-Id: If410ed3a5ff0868c539b5f9fdb6c4b2a0ed38aac
TICKET: CYNGNOS-2031
Diffstat (limited to 'packages/SystemUI')
-rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowManager.java | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowManager.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowManager.java index b5099e7..9a991f4 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowManager.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowManager.java @@ -35,6 +35,8 @@ import com.android.systemui.keyguard.KeyguardViewMediator; import com.android.systemui.statusbar.BaseStatusBar; import com.android.systemui.statusbar.StatusBarState; import com.android.systemui.statusbar.policy.KeyguardMonitor; +import cyanogenmod.providers.CMSettings; +import org.cyanogenmod.internal.util.CmLockPatternUtils; import java.io.FileDescriptor; import java.io.PrintWriter; @@ -258,7 +260,8 @@ public class StatusBarWindowManager implements KeyguardMonitor.Callback { boolean isblur = false; if (mCurrentState.keyguardShowing && mKeyguardBlurEnabled && !mCurrentState.keyguardOccluded - && !mShowingMedia) { + && !mShowingMedia + && !isShowingLiveLockScreen()) { isblur = true; } if (mKeyguardBlur != null) { @@ -394,6 +397,13 @@ public class StatusBarWindowManager implements KeyguardMonitor.Callback { return mCurrentState.keyguardExternalViewHasFocus; } + private boolean isShowingLiveLockScreen() { + CmLockPatternUtils lockPatternUtils = new CmLockPatternUtils(mContext); + return (CMSettings.Secure.getInt(mContext.getContentResolver(), + CMSettings.Secure.LIVE_LOCK_SCREEN_ENABLED, 0) == 1) + && lockPatternUtils.isThirdPartyKeyguardEnabled(); + } + private static class State { boolean keyguardShowing; boolean keyguardOccluded; |