Merge "Longpressing in landscape correctly starts selection mode." (df1324c3) · Commits · e / os / android_frameworks_base

core/java/android/widget/TextView.java

+19 −9

Original line number	Diff line number	Diff line
		@@ -5754,7 +5754,9 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
		if (mInputMethodState != null) {
		mInputMethodState.mExtracting = req;
		}
		// This stops a possible text selection mode. Maybe not intended.
		// This would stop a possible selection mode, but no such mode is started in case
		// extracted mode will start. Some text is selected though, and will trigger an action mode
		// in the extracted view.
		hideControllers();
		}

		@@ -10013,14 +10015,22 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
		}
		}

		final InputMethodManager imm = InputMethodManager.peekInstance();
		boolean extractedTextModeWillBeStartedFullScreen = !(this instanceof ExtractEditText) &&
		imm != null && imm.isFullscreenMode();

		// Do not start the action mode when extracted text will show up full screen, thus
		// immediately hiding the newly created action bar, which would be visually distracting.
		if (!extractedTextModeWillBeStartedFullScreen) {
		ActionMode.Callback actionModeCallback = new SelectionActionModeCallback();
		mSelectionActionMode = startActionMode(actionModeCallback);
		final boolean selectionStarted = mSelectionActionMode != null;
		}
		final boolean selectionStarted = mSelectionActionMode != null \|\|
		extractedTextModeWillBeStartedFullScreen;

		if (selectionStarted && !mTextIsSelectable) {
		if (selectionStarted && !mTextIsSelectable && imm != null) {
		// Show the IME to be able to replace text, except when selecting non editable text.
		final InputMethodManager imm = InputMethodManager.peekInstance();
		if (imm != null) imm.showSoftInput(this, 0, null);
		imm.showSoftInput(this, 0, null);
		}

		return selectionStarted;