SystemUI: hide visualizer when keyguard is occluded

Change-Id: Ia943fd829f7a379fee0f657bb08c34b8c6f36caa
Signed-off-by: Roman Birg <roman@cyngn.com>

4 files changed, 16 insertions, 1 deletions

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/VisualizerView.java b/packages/SystemUI/src/com/android/systemui/statusbar/VisualizerView.java
index 1bfc85d..cbf5e5b 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/VisualizerView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/VisualizerView.java
@@ -52,6 +52,7 @@ public class VisualizerView extends View implements Palette.PaletteAsyncListener
     private boolean mPowerSaveMode = false;
     private boolean mDisplaying = false; // the state we're animating to
     private boolean mDozing = false;
+    private boolean mOccluded = false;
 
     private int mColor;
     private Bitmap mCurrentBitmap;
@@ -254,6 +255,13 @@ public class VisualizerView extends View implements Palette.PaletteAsyncListener
         }
     }
 
+    public void setOccluded(boolean occluded) {
+        if (mOccluded != occluded) {
+            mOccluded = occluded;
+            checkStateChanged();
+        }
+    }
+
     public void setBitmap(Bitmap bitmap) {
         if (mCurrentBitmap == bitmap) {
             return;
@@ -308,7 +316,8 @@ public class VisualizerView extends View implements Palette.PaletteAsyncListener
     }
 
     private void checkStateChanged() {
-        if (mVisible && mPlaying && !mDozing && !mPowerSaveMode && mVisualizerEnabled) {
+        if (mVisible && mPlaying && !mDozing && !mPowerSaveMode && mVisualizerEnabled
+                && !mOccluded) {
             if (!mDisplaying) {
                 mDisplaying = true;
                 AsyncTask.execute(mLinkVisualizer);
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java
index 3987a35..a75fb3e 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java
@@ -1788,6 +1788,7 @@ public class NotificationPanelView extends PanelView implements
                 * mKeyguardStatusBarAnimateAlpha);
         mKeyguardStatusBar.setVisibility(mKeyguardStatusBar.getAlpha() != 0f
                 && !mDozing ? VISIBLE : INVISIBLE);
+        mStatusBar.getVisualizer().setAlpha(mKeyguardStatusBar.getAlpha());
     }
 
     private void updateHeaderKeyguard() {
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 ba3dca8..bee29cb 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
@@ -5099,6 +5099,10 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
         updateDozingState();
     }
 
+    public VisualizerView getVisualizer() {
+        return mVisualizerView;
+    }
+
     private final class ShadeUpdates {
         private final ArraySet<String> mVisibleNotifications = new ArraySet<String>();
         private final ArraySet<String> mNewVisibleNotifications = new ArraySet<String>();
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 f679a69..2048693 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java
@@ -234,6 +234,7 @@ public class StatusBarKeyguardViewManager {
         }
         mOccluded = occluded;
         mStatusBarWindowManager.setKeyguardOccluded(occluded);
+        mPhoneStatusBar.getVisualizer().setOccluded(occluded);
         reset();
     }