diff options
| author | Matt Garnes <matt@cyngn.com> | 2014-06-27 16:16:43 -0700 |
|---|---|---|
| committer | Rajesh Yengisetty <rajesh@cyngn.com> | 2015-04-27 22:28:23 +0000 |
| commit | 3d6a266a83ad078df67acccf2d33610f993a34a3 (patch) | |
| tree | b10db3bbbd8c361cd523636c11d222673037cbc6 | |
| parent | 30f86c21b7513f2bed1009375ff5242c60661bf9 (diff) | |
| download | android_packages_apps_Trebuchet-3d6a266a83ad078df67acccf2d33610f993a34a3.tar.gz android_packages_apps_Trebuchet-3d6a266a83ad078df67acccf2d33610f993a34a3.tar.bz2 android_packages_apps_Trebuchet-3d6a266a83ad078df67acccf2d33610f993a34a3.zip | |
Fix CustomContent display issue.
During certain transition animations, the X offset value is computed,
taking into account the translation value set by the transition effect.
Preserved the right behavior by using child.getLeft() to compute the value,
without including the X translation.
Change-Id: I25acf6e4bae1db9a2c12525125a4994e16c40dfe
(cherry picked from commit 5d2f7ac2757bb2454a558d14760e4c26129d494d)
| -rw-r--r-- | src/com/android/launcher3/PagedView.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/launcher3/PagedView.java b/src/com/android/launcher3/PagedView.java index b314bd19e..827b80d7e 100644 --- a/src/com/android/launcher3/PagedView.java +++ b/src/com/android/launcher3/PagedView.java @@ -1687,7 +1687,7 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc } int baselineX = mPageScrolls[index] + scrollOffset + getViewportOffsetX(); - return (int) (child.getX() - baselineX); + return (int) (child.getLeft() - baselineX); } } |