am 78c6aeef: Merge "Fixed cast exception with selectable text." into jb-dev

* commit '78c6aeeffac7b665a0e1d822e88c92ef2b5ef353':
  Fixed cast exception with selectable text.
This commit is contained in:
Gilles Debunne
2012-06-07 14:18:44 -07:00
committed by Android Git Automerger

View File

@@ -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();