diff options
| author | Android Build Merger (Role) <noreply-android-build-merger@google.com> | 2018-04-28 01:02:39 +0000 |
|---|---|---|
| committer | Android Build Merger (Role) <noreply-android-build-merger@google.com> | 2018-04-28 01:02:39 +0000 |
| commit | b69142fefe44e8971fd0630d234b17ed43acd35f (patch) | |
| tree | d24c40c3e510581c06b2da98221edf69b37fd622 /src | |
| parent | c908cb0814628b7e60411715942af0a96582e164 (diff) | |
| parent | 84b46f0257274f5ebbf6662f55a56de474c5ce1a (diff) | |
| download | packages_apps_Trebuchet-b69142fefe44e8971fd0630d234b17ed43acd35f.tar.gz packages_apps_Trebuchet-b69142fefe44e8971fd0630d234b17ed43acd35f.tar.bz2 packages_apps_Trebuchet-b69142fefe44e8971fd0630d234b17ed43acd35f.zip | |
[automerger] Fixing task misalignment am: 84b46f0257
Change-Id: Id283a7d6e8b69c494a632c95760c9f63ef865e52
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/launcher3/PagedView.java | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/com/android/launcher3/PagedView.java b/src/com/android/launcher3/PagedView.java index adca32784..8311ab9a7 100644 --- a/src/com/android/launcher3/PagedView.java +++ b/src/com/android/launcher3/PagedView.java @@ -607,7 +607,8 @@ public abstract class PagedView<T extends View & PageIndicator> 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<T extends View & PageIndicator> 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) { |