From f888a33e9d451d24e19c98b82777e22dcbcb80cc Mon Sep 17 00:00:00 2001 From: Matt Garnes Date: Fri, 27 Jun 2014 16:16:43 -0700 Subject: 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 --- src/com/android/launcher3/PagedView.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/com/android/launcher3/PagedView.java b/src/com/android/launcher3/PagedView.java index 64d97d1d2..7f145aea2 100644 --- a/src/com/android/launcher3/PagedView.java +++ b/src/com/android/launcher3/PagedView.java @@ -1664,7 +1664,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); } } -- cgit v1.2.3