Merge "Fix an issue where the highlight for drag to split was incorrect" into tm-qpr-dev am: 61d495962f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20389925 Change-Id: I1042b767429ff7f9c1b181bce9332b7ca4076e27 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -311,7 +311,7 @@ public class DragLayout extends LinearLayout {
|
|||||||
animateSplitContainers(true, null /* animCompleteCallback */);
|
animateSplitContainers(true, null /* animCompleteCallback */);
|
||||||
animateHighlight(target);
|
animateHighlight(target);
|
||||||
}
|
}
|
||||||
} else {
|
} else if (mCurrentTarget.type != target.type) {
|
||||||
// Switching between targets
|
// Switching between targets
|
||||||
mDropZoneView1.animateSwitch();
|
mDropZoneView1.animateSwitch();
|
||||||
mDropZoneView2.animateSwitch();
|
mDropZoneView2.animateSwitch();
|
||||||
|
|||||||
Reference in New Issue
Block a user