Merge "Clean mPreviousSolution on change of CellLayout target" into tm-qpr-dev am: 791c9dbf8d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20737634 Change-Id: I675ca6b26651901989b22f5658c0418bf40d340d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -2716,6 +2716,7 @@ public class CellLayout extends ViewGroup {
|
||||
*/
|
||||
void onDragEnter() {
|
||||
mDragging = true;
|
||||
mPreviousSolution = null;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -2730,6 +2731,7 @@ public class CellLayout extends ViewGroup {
|
||||
}
|
||||
|
||||
// Invalidate the drag data
|
||||
mPreviousSolution = null;
|
||||
mDragCell[0] = mDragCell[1] = -1;
|
||||
mDragCellSpan[0] = mDragCellSpan[1] = -1;
|
||||
mDragOutlineAnims[mDragOutlineCurrent].animateOut();
|
||||
|
||||
Reference in New Issue
Block a user