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

Commit fca29e7d authored by Vladislav Kaznacheev's avatar Vladislav Kaznacheev Committed by Android (Google) Code Review
Browse files

Merge "Start respecting View.DRAG_FLAG_GLOBAL flag."

parents 3a96f767 c3debf29

core/java/android/widget/Editor.java

+2 −1
Original line number Diff line number Diff line
@@ -1001,7 +1001,8 @@ public class Editor { 
                CharSequence selectedText = mTextView.getTransformedText(start, end);

                ClipData data = ClipData.newPlainText(null, selectedText);

                DragLocalState localState = new DragLocalState(mTextView, start, end);

                mTextView.startDrag(data, getTextThumbnailBuilder(selectedText), localState, 0);

                mTextView.startDrag(data, getTextThumbnailBuilder(selectedText), localState,

                        View.DRAG_FLAG_GLOBAL);

                stopSelectionActionMode();

            } else {

                stopSelectionActionMode();

services/core/java/com/android/server/wm/WindowManagerService.java

+1 −1
Original line number Diff line number Diff line
@@ -7383,7 +7383,7 @@ public class WindowManagerService extends IWindowManager.Stub 
                        outSurface.copyFrom(surface);

                        final IBinder winBinder = window.asBinder();

                        token = new Binder();

                        mDragState = new DragState(this, token, surface, /*flags*/ 0, winBinder);

                        mDragState = new DragState(this, token, surface, flags, winBinder);

                        token = mDragState.mToken = new Binder();



                        // 5 second timeout for this window to actually begin the drag