Fix scrim flashing when no security is set.

Change-Id: Iccd07c39b57c7bcf3d4d26a00a46926df56eddbc

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java
index 977bb63..5b47749 100644 (file)
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java
@@ -282,7 +282,7 @@ public abstract class PanelView extends FrameLayout {
                         onTrackingStarted();
                     }
                 }
-                final float newHeight = h + mInitialOffsetOnTouch;
+                final float newHeight = Math.max(0, h + mInitialOffsetOnTouch);
                 if (newHeight > mPeekHeight) {
                     if (mPeekAnimator != null) {
                         mPeekAnimator.cancel();
@@ -565,6 +565,7 @@ public abstract class PanelView extends FrameLayout {
             }
         }
 
+        mExpandedHeight = Math.max(0, mExpandedHeight);
         onHeightUpdated(mExpandedHeight);
         mExpandedFraction = Math.min(1f, fhWithoutOverExpansion == 0
                 ? 0

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java
index bf63f7f..2e61b3e 100644 (file)
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java
@@ -94,8 +94,10 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener {
     }
 
     public void setPanelExpansion(float fraction) {
-        mFraction = fraction;
-        scheduleUpdate();
+        if (mFraction != fraction) {
+            mFraction = fraction;
+            scheduleUpdate();
+        }
     }
 
     public void setBouncerShowing(boolean showing) {