summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Garnes <matt@cyngn.com>2014-06-27 23:16:43 (GMT)
committerRaj Yengisetty <rajesh@cyngn.com>2015-04-27 22:20:41 (GMT)
commit5d2f7ac2757bb2454a558d14760e4c26129d494d (patch)
treec7c52acbd1f1490aa4842dc80b1ae497b8c40d15
parentc9e5b1a247e4951fbac7f9af226e2c44448ed6bf (diff)
downloadandroid_packages_apps_Trebuchet-5d2f7ac2757bb2454a558d14760e4c26129d494d.zip
android_packages_apps_Trebuchet-5d2f7ac2757bb2454a558d14760e4c26129d494d.tar.gz
android_packages_apps_Trebuchet-5d2f7ac2757bb2454a558d14760e4c26129d494d.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 b314bd1..827b80d 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);
}
}