1 files changed, 12 insertions, 0 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/LiveLockScreenController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/LiveLockScreenController.java
index 5c6bc4c..68fd4c1 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/LiveLockScreenController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/LiveLockScreenController.java
@@ -10,6 +10,7 @@ import android.os.RemoteException;
 import android.os.ServiceManager;
 import android.util.EventLog;
 
+import android.view.View;
 import com.android.systemui.EventLogTags;
 import com.android.systemui.statusbar.StatusBarState;
 import com.android.systemui.statusbar.phone.NotificationPanelView;
@@ -79,6 +80,10 @@ public class LiveLockScreenController {
             onKeyguardDismissed();
         }
 
+        if (statusBarState == StatusBarState.KEYGUARD) {
+            mBar.getScrimController().forceHideScrims(false);
+        }
+
         mStatusBarState = statusBarState;
         if (statusBarState == StatusBarState.KEYGUARD ||
                 statusBarState == StatusBarState.SHADE_LOCKED) {
@@ -241,12 +246,19 @@ public class LiveLockScreenController {
             EventLog.writeEvent(EventLogTags.SYSUI_LLS_NOTIFICATION_PANEL_SHOWN,
                     hasFocus ? 0 : 1);
         }
+        // Hide statusbar and scrim if live lockscreen
+        // currently has focus
+        mBar.setStatusBarViewVisibility(!hasFocus);
+        mBar.getScrimController().forceHideScrims(hasFocus);
         mLlsHasFocus = hasFocus;
     }
 
     public void onKeyguardDismissed() {
         if (mLiveLockScreenView != null) mLiveLockScreenView.onKeyguardDismissed();
         EventLog.writeEvent(EventLogTags.SYSUI_LLS_KEYGUARD_DISMISSED, mLlsHasFocus ? 1 : 0);
+        // Ensure we reset visibility when keyguard is dismissed
+        mBar.setStatusBarViewVisibility(true);
+        mBar.getScrimController().forceHideScrims(false);
     }
 
     private Runnable mAddNewLiveLockScreenRunnable = new Runnable() {