From f343499f9b2c01978027e810255274b714ac457d Mon Sep 17 00:00:00 2001 From: Adam Cohen Date: Mon, 16 Sep 2013 16:52:59 -0700 Subject: Making sure CustomContent is never visible during overview / springloaded Change-Id: I187f7fcfbd4e24e20959c9e0cf5fd5400d006f45 --- src/com/android/launcher3/PagedView.java | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) (limited to 'src/com/android/launcher3/PagedView.java') diff --git a/src/com/android/launcher3/PagedView.java b/src/com/android/launcher3/PagedView.java index dcb71d274..0b0c4b988 100644 --- a/src/com/android/launcher3/PagedView.java +++ b/src/com/android/launcher3/PagedView.java @@ -1079,7 +1079,7 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc } protected boolean shouldDrawChild(View child) { - return child.getAlpha() > 0; + return child.getAlpha() > 0 && child.getVisibility() == VISIBLE; } @Override @@ -1546,22 +1546,10 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc 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]) { -- cgit v1.2.3