diff options
| author | Andrei Stingaceanu <stg@google.com> | 2015-07-24 14:35:48 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-24 14:35:48 +0000 |
| commit | 45794910031ce2a0e2df3d1694783da7e3c4352b (patch) | |
| tree | c66d41a98125c9558364610be7636eff7afe4d17 /core | |
| parent | ea00f320ee9caad53d63a3eaaee2d4733c9dca50 (diff) | |
| parent | b50045a5196696e707e178813c3a61ea4f3c54f7 (diff) | |
| download | frameworks_base-45794910031ce2a0e2df3d1694783da7e3c4352b.zip frameworks_base-45794910031ce2a0e2df3d1694783da7e3c4352b.tar.gz frameworks_base-45794910031ce2a0e2df3d1694783da7e3c4352b.tar.bz2 | |
Merge "Disallow dragging text in extracted mode" into mnc-dev
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/widget/Editor.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/java/android/widget/Editor.java b/core/java/android/widget/Editor.java index 15d13ae..e169ceb 100644 --- a/core/java/android/widget/Editor.java +++ b/core/java/android/widget/Editor.java @@ -1004,7 +1004,8 @@ public class Editor { } if (!handled && mTextActionMode != null) { - if (touchPositionIsInSelection()) { + // TODO: Fix dragging in extracted mode. + if (touchPositionIsInSelection() && !mTextView.isInExtractedMode()) { // Start a drag final int start = mTextView.getSelectionStart(); final int end = mTextView.getSelectionEnd(); |