summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGilles Debunne <debunne@google.com>2010-09-09 12:00:52 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-09-09 12:00:52 -0700
commitca1b26150943829a296bf38e55ff9c55dbd98182 (patch)
treefb85165a4856e3372e21af7d4c3f7ace1d83ca26
parent45bd99466ce9962778eacaefff1c0a44bb268f0c (diff)
parent87e215fd54559935649fb07264ece600bbabbdf9 (diff)
downloadframeworks_base-ca1b26150943829a296bf38e55ff9c55dbd98182.zip
frameworks_base-ca1b26150943829a296bf38e55ff9c55dbd98182.tar.gz
frameworks_base-ca1b26150943829a296bf38e55ff9c55dbd98182.tar.bz2
am 87e215fd: Merge "Made context menu appear when tapping inside selection." into gingerbread
Merge commit '87e215fd54559935649fb07264ece600bbabbdf9' into gingerbread-plus-aosp * commit '87e215fd54559935649fb07264ece600bbabbdf9': Made context menu appear when tapping inside selection.
-rw-r--r--core/java/android/widget/TextView.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java
index f95a0dd..df451ba 100644
--- a/core/java/android/widget/TextView.java
+++ b/core/java/android/widget/TextView.java
@@ -6633,6 +6633,8 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
if (start == end) {
if (start >= prevStart && start < prevEnd) {
+ // Restore previous selection
+ Selection.setSelection((Spannable)mText, prevStart, prevEnd);
// Tapping inside the selection displays the cut/copy/paste context menu.
showContextMenu();
return;