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

Commit 8bd434f1 authored by Mykola Podolian's avatar Mykola Podolian Committed by Android (Google) Code Review
Browse files

Merge "Don`t notify bubble bar of drag exit if it does not show the drop target" into main

parents 8da82965 b6bca36e

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

+6 −3
Original line number Diff line number Diff line
@@ -663,9 +663,11 @@ public class DragLayout extends LinearLayout 
                    mSession = null;

            }

        });

        // notify bubbles of drag cancel

        if (mCurrentBubbleBarTarget != null) {

            // bubble bar is still showing drop target, notify bubbles of drag cancel

            mCurrentBubbleBarTarget = null;

            mBubbleBarDragListener.onItemDraggedOutsideBubbleBarDropZone();

        }

        // Reset the state if we previously force-ignore the bottom margin

        mDropZoneView1.setForceIgnoreBottomMargin(false);

        mDropZoneView2.setForceIgnoreBottomMargin(false);
@@ -693,6 +695,7 @@ public class DragLayout extends LinearLayout 
            mBubbleBarDragListener.onItemDroppedOverBubbleBarDragZone(mCurrentBubbleBarTarget,

                    appData);

        }

        mCurrentBubbleBarTarget = null;



        // Start animating the drop UI out with the drag surface

        hide(event, dropCompleteCallback);