commit f343499f9b2c01978027e810255274b714ac457d
author Adam Cohen <adamcohen@google.com> Mon Sep 16 16:52:59 2013 -0700
committer Adam Cohen <adamcohen@google.com> Mon Sep 16 16:53:18 2013 -0700
tree 56c2b7d76cdffffde326db9a00e0d1984a2d0718
parent d3ecce919296594ceeed6619d32994360b65ae40

Making sure CustomContent is never visible during overview / springloaded

Change-Id: I187f7fcfbd4e24e20959c9e0cf5fd5400d006f45

src/com/android/launcher3/PagedView.java

diff --git a/src/com/android/launcher3/PagedView.java b/src/com/android/launcher3/PagedView.java
index dcb71d2..0b0c4b9 100644
--- a/src/com/android/launcher3/PagedView.java
+++ b/src/com/android/launcher3/PagedView.java
@@ -1079,7 +1079,7 @@
     }
 
     protected boolean shouldDrawChild(View child) {
-        return child.getAlpha() > 0;
+        return child.getAlpha() > 0 && child.getVisibility() == VISIBLE;
     }
 
     @Override
@@ -1546,22 +1546,10 @@
         getOverviewModePages(mTempVisiblePagesRange);
         if (!mFreeScroll) {
             snapToPage(snapPage);
-
-            for (int i = 0; i < getPageCount(); ++i) {
-                if (i < mTempVisiblePagesRange[0] || i > mTempVisiblePagesRange[1]) {
-                    getPageAt(i).setAlpha(1f);
-                }
-            }
         } else {
             mFreeScrollMinScrollX = getScrollForPage(mTempVisiblePagesRange[0]);
             mFreeScrollMaxScrollX = getScrollForPage(mTempVisiblePagesRange[1]);
 
-            for (int i = 0; i < getPageCount(); ++i) {
-                if (i < mTempVisiblePagesRange[0] || i > mTempVisiblePagesRange[1]) {
-                    getPageAt(i).setAlpha(0f);
-                }
-            }
-
             if (getCurrentPage() < mTempVisiblePagesRange[0]) {
                 setCurrentPage(mTempVisiblePagesRange[0]);
             } else if (getCurrentPage() > mTempVisiblePagesRange[1]) {