Fixing focus indicator position when the overlay page has different
size than the current page.
Bug: 20104483
Change-Id: Ib79d1bc4eeffc03b706ad6d77d8285b8a7f1188a
diff --git a/src/com/android/launcher3/FocusIndicatorView.java b/src/com/android/launcher3/FocusIndicatorView.java
index ab21c90..ecf93e4 100644
--- a/src/com/android/launcher3/FocusIndicatorView.java
+++ b/src/com/android/launcher3/FocusIndicatorView.java
@@ -149,7 +149,7 @@
}
/**
- * Computes the location of a view relative to {@link #mCommonParent}, off-setting
+ * Computes the location of a view relative to {@param parent}, off-setting
* any shift due to page view scroll.
* @param pos an array of two integers in which to hold the coordinates
*/
@@ -166,12 +166,12 @@
private static void computeLocationRelativeToParentHelper(View child,
View commonParent, int[] shift) {
View parent = (View) child.getParent();
- if (parent instanceof PagedView) {
- child = ((PagedView) parent).getPageAt(0);
- }
-
shift[0] += child.getLeft();
shift[1] += child.getTop();
+ if (parent instanceof PagedView) {
+ PagedView page = (PagedView) parent;
+ shift[0] -= page.getScrollForPage(page.indexOfChild(child));
+ }
if (parent != commonParent) {
computeLocationRelativeToParentHelper(parent, commonParent, shift);