Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9dc94dcd authored by Mady Mellor's avatar Mady Mellor Committed by Automerger Merge Worker
Browse files

Merge "Fix an issue where the highlight for drag to split was incorrect" into... 

Merge "Fix an issue where the highlight for drag to split was incorrect" into tm-qpr-dev am: 61d49596 am: 30919118

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20389925



Change-Id: I04e21f3c8901865ca895ed4c0315b4bd99d11617
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5df55892 30919118

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

+1 −1
Original line number Diff line number Diff line
@@ -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();