summaryrefslogtreecommitdiff
path: root/core/java/android/widget/TextView.java
diff options
context:
space:
mode:
authorMihai Popa <popam@google.com>2018-02-21 11:51:34 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2018-02-21 11:51:34 +0000
commit78cab5a5961b37d984069697dd0ba684184de6bd (patch)
tree1362441a883e5d006c0ecd833b1221fe3703fee8 /core/java/android/widget/TextView.java
parent756d00b9b8c4ca90072aa8f6e529ddcd8b6070ce (diff)
parenta4e39c4f596ebcc3769afdc358d78386c9f6f63b (diff)
Merge "[Magnifier-23] Fix invisible cursor in magnifier"
Diffstat (limited to 'core/java/android/widget/TextView.java')
-rw-r--r--core/java/android/widget/TextView.java4
1 files changed, 1 insertions, 3 deletions
diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java
index 708d008d2ca1..2cfdb7693a38 100644
--- a/core/java/android/widget/TextView.java
+++ b/core/java/android/widget/TextView.java
@@ -6994,9 +6994,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
final int selEnd = getSelectionEnd();
if (mMovement != null && (isFocused() || isPressed()) && selStart >= 0) {
if (selStart == selEnd) {
- if (mEditor != null && mEditor.isCursorVisible()
- && (SystemClock.uptimeMillis() - mEditor.mShowCursor)
- % (2 * Editor.BLINK) < Editor.BLINK) {
+ if (mEditor != null && mEditor.shouldRenderCursor()) {
if (mHighlightPathBogus) {
if (mHighlightPath == null) mHighlightPath = new Path();
mHighlightPath.reset();