Making current screen background always transparent

Change-Id: I3cc61f85c36f80a71d60228f5f8570758b1b0e3b

2 files changed, 9 insertions, 5 deletions

diff --git a/src/com/android/launcher2/CellLayout.java b/src/com/android/launcher2/CellLayout.java
index 11c0c1822..63871a7fe 100644
--- a/src/com/android/launcher2/CellLayout.java
+++ b/src/com/android/launcher2/CellLayout.java
@@ -839,6 +839,10 @@ public class CellLayout extends ViewGroup implements Dimmable {
         mBackgroundAlphaMultiplier = multiplier;
     }
 
+    public float getBackgroundAlphaMultiplier() {
+        return mBackgroundAlphaMultiplier;
+    }
+
     public void setBackgroundAlpha(float alpha) {
         mBackgroundAlpha = alpha;
         invalidate();
diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java
index e068a7683..393c65b3b 100644
--- a/src/com/android/launcher2/Workspace.java
+++ b/src/com/android/launcher2/Workspace.java
@@ -558,12 +558,11 @@ public class Workspace extends SmoothPagedView
                 int delta = screenCenter - (getChildOffset(i) -
                         getRelativeChildOffset(i) + halfScreenSize);
 
-                float scrollProgress = delta/(totalDistance*1.0f);
+                float scrollProgress = delta / (totalDistance * 1.0f);
                 scrollProgress = Math.min(scrollProgress, 1.0f);
                 scrollProgress = Math.max(scrollProgress, -1.0f);
 
-                float mult =  mInDragMode ? 1.0f : Math.abs(scrollProgress);
-                cl.setBackgroundAlphaMultiplier(mult);
+                cl.setBackgroundAlphaMultiplier(Math.abs(scrollProgress));
 
                 float rotation = WORKSPACE_ROTATION * scrollProgress;
                 cl.setRotationY(rotation);
@@ -779,6 +778,9 @@ public class Workspace extends SmoothPagedView
         mActivePointerId = INVALID_POINTER;
 
         CellLayout currentPage = (CellLayout) getChildAt(mCurrentPage);
+        if (currentPage.getBackgroundAlphaMultiplier() < 1.0f) {
+            currentPage.setBackgroundAlpha(0.0f);
+        }
         currentPage.setBackgroundAlphaMultiplier(1.0f);
 
         final Resources res = getResources();
@@ -1351,8 +1353,6 @@ public class Workspace extends SmoothPagedView
             mDragTargetLayout.onDragEnter();
             showOutlines();
             mInDragMode = true;
-            CellLayout cl = (CellLayout) getChildAt(mCurrentPage);
-            cl.setBackgroundAlphaMultiplier(1.0f);
         }
     }