diff options
| author | 2015-03-20 00:15:42 +0000 | |
|---|---|---|
| committer | 2015-03-20 00:15:43 +0000 | |
| commit | fca29e7d49c3254c837f0c94f3346b41adf08181 (patch) | |
| tree | 6d5fec4e80d41f4c2c09c1efad1f9fee72338fad | |
| parent | 3a96f767c3a368969a58e319ad36df5cb39b15f2 (diff) | |
| parent | c3debf29d68fa711a98027d60cb33a66305d1d0a (diff) | |
Merge "Start respecting View.DRAG_FLAG_GLOBAL flag."
| -rw-r--r-- | core/java/android/widget/Editor.java | 3 | ||||
| -rw-r--r-- | services/core/java/com/android/server/wm/WindowManagerService.java | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/core/java/android/widget/Editor.java b/core/java/android/widget/Editor.java index fd344155e3a7..3fca463ee9f3 100644 --- a/core/java/android/widget/Editor.java +++ b/core/java/android/widget/Editor.java @@ -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(); diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java index 9a97a2dace7a..4c80b07763c8 100644 --- a/services/core/java/com/android/server/wm/WindowManagerService.java +++ b/services/core/java/com/android/server/wm/WindowManagerService.java @@ -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 |