diff options
| author | Vladislav Kaznacheev <kaznacheev@google.com> | 2015-03-18 16:28:06 -0700 |
|---|---|---|
| committer | Vladislav Kaznacheev <kaznacheev@google.com> | 2015-03-18 16:32:21 -0700 |
| commit | c3debf29d68fa711a98027d60cb33a66305d1d0a (patch) | |
| tree | c48f589feab7fdae573d60668e202edad7f551a4 | |
| parent | 78d9de97a624f4edd0d9ad028e084f98e523e5e8 (diff) | |
| download | frameworks_base-c3debf29d68fa711a98027d60cb33a66305d1d0a.zip frameworks_base-c3debf29d68fa711a98027d60cb33a66305d1d0a.tar.gz frameworks_base-c3debf29d68fa711a98027d60cb33a66305d1d0a.tar.bz2 | |
Start respecting View.DRAG_FLAG_GLOBAL flag.
Respect flags passed to startDrag (they used to be ignored).
Allow global drag&drop for text views.
Bug: 19548858
Change-Id: I981cfd617ebc6f5f2d59ebded798c22dc4920d38
| -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 d93b212..2131863 100644 --- a/core/java/android/widget/Editor.java +++ b/core/java/android/widget/Editor.java @@ -995,7 +995,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 9a97a2d..4c80b07 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 |