diff options
| -rw-r--r-- | core/java/android/widget/TextView.java | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java index 138aefa0ed09..5be52c43d585 100644 --- a/core/java/android/widget/TextView.java +++ b/core/java/android/widget/TextView.java @@ -6668,10 +6668,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener if (mInputContentType != null) { mInputContentType.enterDown = false; } - hideInsertionPointCursorController(); - if (mSelectionModifierCursorController != null) { - mSelectionModifierCursorController.hide(); - } + hideControllers(); } startStopMarquee(hasWindowFocus); @@ -6681,10 +6678,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener protected void onVisibilityChanged(View changedView, int visibility) { super.onVisibilityChanged(changedView, visibility); if (visibility != VISIBLE) { - hideInsertionPointCursorController(); - if (mSelectionModifierCursorController != null) { - mSelectionModifierCursorController.hide(); - } + hideControllers(); } } @@ -7643,10 +7637,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener private void stopTextSelectionMode() { if (mIsInTextSelectionMode) { Selection.setSelection((Spannable) mText, getSelectionEnd()); - if (mSelectionModifierCursorController != null) { - mSelectionModifierCursorController.hide(); - } - + hideSelectionModifierCursorController(); mIsInTextSelectionMode = false; } } @@ -8182,9 +8173,15 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener } } + private void hideSelectionModifierCursorController() { + if (mSelectionModifierCursorController != null) { + mSelectionModifierCursorController.hide(); + } + } + private void hideControllers() { hideInsertionPointCursorController(); - stopTextSelectionMode(); + hideSelectionModifierCursorController(); } private int getOffsetForHorizontal(int line, int x) { |