diff options
| author | Danesh M <daneshm90@gmail.com> | 2014-06-04 23:51:37 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2014-06-04 23:51:37 +0000 |
| commit | 129b7163fc3d3df45e2ba76794d6184454431963 (patch) | |
| tree | d63dd727449554b4562d29c197086904351d636a | |
| parent | 7bdf4ea47e247a7c51376690c2e1008a75112a7e (diff) | |
| parent | e5315923d298bf3f623532dbf7a98bdbb3f404f0 (diff) | |
| download | android_packages_apps_Trebuchet-129b7163fc3d3df45e2ba76794d6184454431963.tar.gz android_packages_apps_Trebuchet-129b7163fc3d3df45e2ba76794d6184454431963.tar.bz2 android_packages_apps_Trebuchet-129b7163fc3d3df45e2ba76794d6184454431963.zip | |
Merge "Fix bug: Scroll Effect issues in Workspace" into cm-11.0
| -rw-r--r-- | src/com/android/launcher3/PagedView.java | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/com/android/launcher3/PagedView.java b/src/com/android/launcher3/PagedView.java index f050799ae..dbec42fa8 100644 --- a/src/com/android/launcher3/PagedView.java +++ b/src/com/android/launcher3/PagedView.java @@ -3104,10 +3104,10 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc v.setAlpha(alpha); } - // If the view has 0 alpha, we set it to be invisible so as to prevent + // If the view has 0 alpha, we move it off screen so as to prevent // it from accepting touches if (alpha == 0) { - v.setVisibility(INVISIBLE); + v.setTranslationX(v.getMeasuredWidth() * -10f); } else if (v.getVisibility() != VISIBLE) { v.setVisibility(VISIBLE); } @@ -3149,8 +3149,7 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc v.setVisibility(VISIBLE); } } else { - v.setTranslationX(0f); - v.setVisibility(INVISIBLE); + v.setTranslationX(v.getMeasuredWidth() * -10f); } } } |