summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Garnes <matt@cyngn.com>2014-06-27 23:16:43 (GMT)
committerMatt Garnes <matt@cyngn.com>2014-06-27 23:23:15 (GMT)
commitf888a33e9d451d24e19c98b82777e22dcbcb80cc (patch)
treec4ea96610c4782ef1f0b0319d344a10fb74bf590
parent71ea5a113aa7d0991fb0c07d095189d2f8e553b1 (diff)
downloadandroid_packages_apps_Trebuchet-f888a33e9d451d24e19c98b82777e22dcbcb80cc.zip
android_packages_apps_Trebuchet-f888a33e9d451d24e19c98b82777e22dcbcb80cc.tar.gz
android_packages_apps_Trebuchet-f888a33e9d451d24e19c98b82777e22dcbcb80cc.tar.bz2
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
-rw-r--r--src/com/android/launcher3/PagedView.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/launcher3/PagedView.java b/src/com/android/launcher3/PagedView.java
index 64d97d1..7f145ae 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);
}
}