PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 724d0e22: Merge "Fixing focus indicator position when the overlay page has different size than the current page." into ub-launcher3-burnaby

Browse Source 
* commit '724d0e22ac0811a17a39c682aec2cc6a13bee1bc':
  Fixing focus indicator position when the overlay page has different size than the current page.
This commit is contained in:
Sunny Goyal
2015-04-08 17:51:30 +00:00
committed by Android Git Automerger
parent 54b4af3fe4 724d0e22ac
commit 33a70ab96b
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher3/FocusIndicatorView.java
+5 -5
View File
@@ -149,7 +149,7 @@ public class FocusIndicatorView extends View implements View.OnFocusChangeListen
}
/**
* 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 @@ public class FocusIndicatorView extends View implements View.OnFocusChangeListen
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);