From 84b46f0257274f5ebbf6662f55a56de474c5ce1a Mon Sep 17 00:00:00 2001 From: Vadim Tryshev Date: Fri, 27 Apr 2018 17:45:10 -0700 Subject: [PATCH] Fixing task misalignment Bug: 78793769 Test: Manual Change-Id: I49f8213bf412f63fc296a8be5bd49950e4c01175 --- src/com/android/launcher3/PagedView.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/com/android/launcher3/PagedView.java b/src/com/android/launcher3/PagedView.java index adca327845..8311ab9a76 100644 --- a/src/com/android/launcher3/PagedView.java +++ b/src/com/android/launcher3/PagedView.java @@ -607,7 +607,8 @@ public abstract class PagedView extends ViewGrou final int endIndex = mIsRtl ? -1 : childCount; final int delta = mIsRtl ? -1 : 1; - final int verticalPadding = getPaddingTop() + getPaddingBottom(); + final int verticalCenter = (getPaddingTop() + getMeasuredHeight() + mInsets.top + - mInsets.bottom - getPaddingBottom()) / 2; final int scrollOffsetLeft = mInsets.left + getPaddingLeft(); boolean pageScrollChanged = false; @@ -617,9 +618,7 @@ public abstract class PagedView extends ViewGrou i += delta) { final View child = getPageAt(i); if (scrollLogic.shouldIncludeView(child)) { - final int childTop = getPaddingTop() + - (getMeasuredHeight() - mInsets.bottom - verticalPadding - - child.getMeasuredHeight()) / 2; + final int childTop = verticalCenter - child.getMeasuredHeight() / 2; final int childWidth = child.getMeasuredWidth(); if (layoutChildren) {