am 8c44e745: Merge "Landscape extracted mode - floating toolbar interference" into mnc-dev (033bbf6c) · Commits · e / os / android_frameworks_base

core/java/android/widget/Editor.java

+18 −0

Original line number	Diff line number	Diff line
		@@ -1699,6 +1699,15 @@ public class Editor {
		* @return true if the selection mode was actually started.
		*/
		private boolean startSelectionActionModeWithoutSelection() {
		if (extractedTextModeWillBeStarted()) {
		// Cancel the single tap delayed runnable.
		if (mSelectionModeWithoutSelectionRunnable != null) {
		mTextView.removeCallbacks(mSelectionModeWithoutSelectionRunnable);
		}

		return false;
		}

		if (mSelectionActionMode != null) {
		// Selection action mode is already started
		// TODO: revisit invocations to minimize this case.
		@@ -1740,6 +1749,15 @@ public class Editor {
		}

		private boolean startSelectionActionModeWithSelectionInternal() {
		if (extractedTextModeWillBeStarted()) {
		// Cancel the single tap delayed runnable.
		if (mSelectionModeWithoutSelectionRunnable != null) {
		mTextView.removeCallbacks(mSelectionModeWithoutSelectionRunnable);
		}

		return false;
		}

		if (mSelectionActionMode != null) {
		// Selection action mode is already started
		mSelectionActionMode.invalidate();