diff options
| author | Gilles Debunne <debunne@google.com> | 2011-01-24 14:46:42 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-01-24 14:46:42 -0800 |
| commit | 705a27a97ccd8e363944083d948b7f5204916b85 (patch) | |
| tree | aa7bfb15e4ca1bce2199d31b7a97505557821763 /core | |
| parent | c831e3192ccd9b2cf69ec7c973005e578631da3b (diff) | |
| parent | 98dbfd4940fb7f1e3ae11ec73aeb7a9dd26a24ee (diff) | |
| download | frameworks_base-705a27a97ccd8e363944083d948b7f5204916b85.zip frameworks_base-705a27a97ccd8e363944083d948b7f5204916b85.tar.gz frameworks_base-705a27a97ccd8e363944083d948b7f5204916b85.tar.bz2 | |
Merge "Non-editable TextViews should not display a cursor." into honeycomb
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/widget/TextView.java | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java index a0a615a..ab07a7e 100644 --- a/core/java/android/widget/TextView.java +++ b/core/java/android/widget/TextView.java @@ -4334,7 +4334,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener selStart = getSelectionStart(); selEnd = getSelectionEnd(); - if ((mCursorVisible || mTextIsSelectable) && selStart >= 0 && isEnabled()) { + if ((isCursorVisible() || mTextIsSelectable) && selStart >= 0 && isEnabled()) { if (mHighlightPath == null) mHighlightPath = new Path(); @@ -6491,6 +6491,10 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener prepareCursorControllers(); } + private boolean isCursorVisible() { + return mCursorVisible && isTextEditable(); + } + private boolean canMarquee() { int width = (mRight - mLeft - getCompoundPaddingLeft() - getCompoundPaddingRight()); return width > 0 && mLayout.getLineWidth(0) > width; @@ -6979,7 +6983,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener } private void makeBlink() { - if (!mCursorVisible || !isTextEditable()) { + if (!isCursorVisible()) { if (mBlink != null) { mBlink.removeCallbacks(mBlink); } @@ -7373,8 +7377,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener || windowParams.type > WindowManager.LayoutParams.LAST_SUB_WINDOW; } - mInsertionControllerEnabled = windowSupportsHandles && isTextEditable() && mCursorVisible && - mLayout != null; + mInsertionControllerEnabled = windowSupportsHandles && isCursorVisible() && mLayout != null; mSelectionControllerEnabled = windowSupportsHandles && textCanBeSelected() && mLayout != null; |