diff options
| author | Michael Jurka <mikejurka@google.com> | 2012-05-06 19:23:41 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-05-06 19:23:41 -0700 |
| commit | 30774acbb8b8711e3eef48ac9baaec99788d16a0 (patch) | |
| tree | b1895740c0ad9e9c9ee78b29c98d055aa0dc7086 /src/com/android/launcher2/PagedView.java | |
| parent | 04cb48f465e7a9382efa9438ef9826ba5bcb416d (diff) | |
| parent | 869390b6abd6e005a5ce85a8ee3c11daeecce919 (diff) | |
| download | android_packages_apps_Trebuchet-30774acbb8b8711e3eef48ac9baaec99788d16a0.tar.gz android_packages_apps_Trebuchet-30774acbb8b8711e3eef48ac9baaec99788d16a0.tar.bz2 android_packages_apps_Trebuchet-30774acbb8b8711e3eef48ac9baaec99788d16a0.zip | |
Merge "Unify tablet/phone workspace scrolling behavior" into jb-dev
Diffstat (limited to 'src/com/android/launcher2/PagedView.java')
| -rw-r--r-- | src/com/android/launcher2/PagedView.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/launcher2/PagedView.java b/src/com/android/launcher2/PagedView.java index adfe0de81..b850ce275 100644 --- a/src/com/android/launcher2/PagedView.java +++ b/src/com/android/launcher2/PagedView.java @@ -627,7 +627,9 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc if (isScrollingIndicatorEnabled()) { updateScrollingIndicator(); } - if (mFadeInAdjacentScreens) { + boolean isInOverscroll = mOverScrollX < 0 || mOverScrollX > mMaxScrollX; + + if (mFadeInAdjacentScreens && !isInOverscroll) { for (int i = 0; i < getChildCount(); i++) { View child = getChildAt(i); if (child != null) { |