commit | 2a0516f6cc95ca0051dcb41895ac9c8a993d25be | [log] [tgz] |
---|---|---|
author | Adam Cohen <adamcohen@google.com> | Thu Jul 22 22:55:49 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jul 22 22:55:49 2021 +0000 |
tree | fb38d29d397229575b2150d8ae4217bc21ef6e5a | |
parent | 1800f916add8dc6d47f93a5ade98619ed0ad3acf [diff] | |
parent | ed82e0daef3226e645b90210393d92fb73b8f00a [diff] |
Fix widget drop preview outline on 4x5 grids am: ed82e0daef Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15351419 Change-Id: I37f0cde316ac0a4c7b793ad25b23d5208ca90b65
diff --git a/src/com/android/launcher3/CellLayout.java b/src/com/android/launcher3/CellLayout.java index f4447b1..af6cce1 100644 --- a/src/com/android/launcher3/CellLayout.java +++ b/src/com/android/launcher3/CellLayout.java
@@ -566,9 +566,10 @@ int spanX = mDragOutlines[i].cellHSpan; int spanY = mDragOutlines[i].cellVSpan; + // TODO b/194414754 clean this up, reconcile with cellToRect mVisualizeGridRect.set(paddingX, paddingY, - mCellWidth * spanX - paddingX, - mCellHeight * spanY - paddingY); + mCellWidth * spanX + mBorderSpacing * (spanX - 1) - paddingX, + mCellHeight * spanY + mBorderSpacing * (spanY - 1) - paddingY); int transX = x * mCellWidth + (x * mBorderSpacing) + getPaddingLeft() + paddingX;