summaryrefslogtreecommitdiffstats
path: root/packages/SystemUI/src
diff options
context:
space:
mode:
Diffstat (limited to 'packages/SystemUI/src')
-rw-r--r--packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowManager.java12
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;