Merge "Fix an issue where the highlight for drag to split was incorrect" into tm-qpr-dev

libs/WindowManager/Shell/src/com/android/wm/shell/draganddrop/DragLayout.java

@@ -311,7 +311,7 @@ public class DragLayout extends LinearLayout {
                     animateSplitContainers(true, null /* animCompleteCallback */);
                     animateHighlight(target);
                 }
-            } else {
+            } else if (mCurrentTarget.type != target.type) {
                 // Switching between targets
                 mDropZoneView1.animateSwitch();
                 mDropZoneView2.animateSwitch();