summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher3/PagedView.java
diff options
context:
space:
mode:
authorAdam Cohen <adamcohen@google.com>2013-09-16 16:52:59 -0700
committerAdam Cohen <adamcohen@google.com>2013-09-16 16:53:18 -0700
commitf343499f9b2c01978027e810255274b714ac457d (patch)
tree56c2b7d76cdffffde326db9a00e0d1984a2d0718 /src/com/android/launcher3/PagedView.java
parentd3ecce919296594ceeed6619d32994360b65ae40 (diff)
downloadandroid_packages_apps_Trebuchet-f343499f9b2c01978027e810255274b714ac457d.tar.gz
android_packages_apps_Trebuchet-f343499f9b2c01978027e810255274b714ac457d.tar.bz2
android_packages_apps_Trebuchet-f343499f9b2c01978027e810255274b714ac457d.zip
Making sure CustomContent is never visible during overview / springloaded
Change-Id: I187f7fcfbd4e24e20959c9e0cf5fd5400d006f45
Diffstat (limited to 'src/com/android/launcher3/PagedView.java')
-rw-r--r--src/com/android/launcher3/PagedView.java14
1 files changed, 1 insertions, 13 deletions
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]) {