diff options
| author | Gilles Debunne <debunne@google.com> | 2012-06-07 14:15:40 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-06-07 14:15:40 -0700 |
| commit | 78c6aeeffac7b665a0e1d822e88c92ef2b5ef353 (patch) | |
| tree | a85ceced9d58ccac13b351d2697fdf10da35e27f /core/java/android/widget/TextView.java | |
| parent | 0646411cbd91039e843c0f3067ea0a379176978a (diff) | |
| parent | 857c341dfe36324fb32d7debc06d536cd8a9add1 (diff) | |
Merge "Fixed cast exception with selectable text." into jb-dev
Diffstat (limited to 'core/java/android/widget/TextView.java')
| -rw-r--r-- | core/java/android/widget/TextView.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java index 131b0754e4cb..01617da73b9a 100644 --- a/core/java/android/widget/TextView.java +++ b/core/java/android/widget/TextView.java @@ -4656,7 +4656,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener // mInputType should already be EditorInfo.TYPE_NULL and mInput should be null setMovementMethod(selectable ? ArrowKeyMovementMethod.getInstance() : null); - setText(getText(), selectable ? BufferType.SPANNABLE : BufferType.NORMAL); + setText(mText, selectable ? BufferType.SPANNABLE : BufferType.NORMAL); // Called by setText above, but safer in case of future code changes mEditor.prepareCursorControllers(); |