From 4b22bdfa84eb3b62f83982281798145e56fce21d Mon Sep 17 00:00:00 2001
From: Dan Sandler <dsandler@android.com>
Date: Thu, 5 Jun 2014 00:58:02 -0400
Subject: [PATCH] Don't show private notifications if a secure lockscreen is
 merely occluded.

Bug: 15430088
Change-Id: I27187216462b5bb7d52c3f85b9444348138fd9ea
---
 .../com/android/systemui/statusbar/phone/PhoneStatusBar.java  | 4 +++-
 .../statusbar/phone/StatusBarKeyguardViewManager.java         | 4 ++++
 2 files changed, 7 insertions(+), 1 deletion(-)

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 e55de947c75d4..1dfb8fa4befb4 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
@@ -2851,7 +2851,9 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
     }
 
     private void updatePublicMode() {
-        setLockscreenPublicMode(mState == StatusBarState.KEYGUARD
+        setLockscreenPublicMode(
+                (mStatusBarKeyguardViewManager.isShowing() || 
+                    mStatusBarKeyguardViewManager.isOccluded())
                 && mStatusBarKeyguardViewManager.isSecure());
     }
 
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java
index e3145a6587852..09e4d940b2e1a 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java
@@ -181,6 +181,10 @@ public class StatusBarKeyguardViewManager {
         reset();
     }
 
+    public boolean isOccluded() {
+        return mOccluded;
+    }
+
     /**
      * Hides the keyguard view
      */