summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2010-05-19 08:41:26 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-05-19 08:41:26 -0700
commitb39b0f32d1c24e326886d8d27c8ad7dde38e28d0 (patch)
treeac66b96c1f6fc723c1244ec10353bb3dc9614560
parent627356cee467fad0335b2bc8cc058a3784f0bf63 (diff)
parentfaf9a78363b0c773b95c9b43263d788aee313054 (diff)
downloadframeworks_base-b39b0f32d1c24e326886d8d27c8ad7dde38e28d0.zip
frameworks_base-b39b0f32d1c24e326886d8d27c8ad7dde38e28d0.tar.gz
frameworks_base-b39b0f32d1c24e326886d8d27c8ad7dde38e28d0.tar.bz2
am faf9a783: merge from open-source master
Merge commit 'faf9a78363b0c773b95c9b43263d788aee313054' into kraken * commit 'faf9a78363b0c773b95c9b43263d788aee313054': Text disappears when selecting text in text editor.
-rw-r--r--core/java/android/widget/TextView.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java
index 64c9c99..950012c 100644
--- a/core/java/android/widget/TextView.java
+++ b/core/java/android/widget/TextView.java
@@ -4547,6 +4547,10 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
outText.text = TextUtils.substring(content, partialStartOffset,
partialEndOffset);
}
+ } else {
+ outText.partialStartOffset = 0;
+ outText.partialEndOffset = 0;
+ outText.text = "";
}
outText.flags = 0;
if (MetaKeyKeyListener.getMetaState(mText, MetaKeyKeyListener.META_SELECTING) != 0) {