Merge "Tweak and fix bugs with new app close transition." into ub-launcher3-edmonton

1 files changed, 13 insertions, 3 deletions

diff --git a/src/com/android/launcher3/graphics/WorkspaceAndHotseatScrim.java b/src/com/android/launcher3/graphics/WorkspaceAndHotseatScrim.java
index 9d847d6da..bc4a06d5e 100644
--- a/src/com/android/launcher3/graphics/WorkspaceAndHotseatScrim.java
+++ b/src/com/android/launcher3/graphics/WorkspaceAndHotseatScrim.java
@@ -36,7 +36,6 @@ import android.graphics.Shader;
 import android.graphics.drawable.Drawable;
 import android.support.v4.graphics.ColorUtils;
 import android.util.DisplayMetrics;
-import android.util.Log;
 import android.util.Property;
 import android.view.View;
 
@@ -137,6 +136,7 @@ public class WorkspaceAndHotseatScrim implements
     private int mScrimAlpha = 0;
 
     private float mSysUiProgress = 1;
+    private boolean mHideSysUiScrim;
 
     private boolean mAnimateScrimOnNextDraw = false;
     private float mSysUiAnimMultiplier = 1;
@@ -184,7 +184,7 @@ public class WorkspaceAndHotseatScrim implements
             canvas.restore();
         }
 
-        if (mHasSysUiScrim) {
+        if (!mHideSysUiScrim && mHasSysUiScrim) {
             if (mSysUiProgress <= 0) {
                 mAnimateScrimOnNextDraw = false;
                 return;
@@ -264,6 +264,14 @@ public class WorkspaceAndHotseatScrim implements
         }
     }
 
+    public void hideSysUiScrim(boolean hideSysUiScrim) {
+        mHideSysUiScrim = hideSysUiScrim;
+        if (!hideSysUiScrim) {
+            mAnimateScrimOnNextDraw = true;
+        }
+        invalidate();
+    }
+
     private void setSysUiProgress(float progress) {
         if (progress != mSysUiProgress) {
             mSysUiProgress = progress;
@@ -274,7 +282,9 @@ public class WorkspaceAndHotseatScrim implements
     private void reapplySysUiAlpha() {
         if (mHasSysUiScrim) {
             reapplySysUiAlphaNoInvalidate();
-            invalidate();
+            if (!mHideSysUiScrim) {
+                invalidate();
+            }
         }
     }