Merge "Stop cursor from blinking when not visible" (ad5f5557) · Commits · e / os / android_frameworks_base

core/java/android/widget/Editor.java

+5 −9

Original line number	Diff line number	Diff line
		@@ -709,7 +709,7 @@ public class Editor {
		}

		getPositionListener().addSubscriber(mCursorAnchorInfoNotifier, true);
		resumeBlink();
		makeBlink();
		}

		void onDetachedFromWindow() {
		@@ -1685,17 +1685,12 @@ public class Editor {

		void onWindowFocusChanged(boolean hasWindowFocus) {
		if (hasWindowFocus) {
		if (mBlink != null) {
		mBlink.uncancel();
		makeBlink();
		}
		resumeBlink();
		if (mTextView.hasSelection() && !extractedTextModeWillBeStarted()) {
		refreshTextActionMode();
		}
		} else {
		if (mBlink != null) {
		mBlink.cancel();
		}
		suspendBlink();
		if (mInputContentType != null) {
		mInputContentType.enterDown = false;
		}
		@@ -2851,7 +2846,8 @@ public class Editor {
		* @return True when the TextView isFocused and has a valid zero-length selection (cursor).
		*/
		private boolean shouldBlink() {
		if (!isCursorVisible() \|\| !mTextView.isFocused()) return false;
		if (!isCursorVisible() \|\| !mTextView.isFocused()
		\|\| mTextView.getWindowVisibility() != mTextView.VISIBLE) return false;

		final int start = mTextView.getSelectionStart();
		if (start < 0) return false;