diff options
| -rw-r--r-- | core/java/android/widget/Editor.java | 5 | ||||
| -rw-r--r-- | core/java/android/widget/TextView.java | 6 |
2 files changed, 7 insertions, 4 deletions
diff --git a/core/java/android/widget/Editor.java b/core/java/android/widget/Editor.java index 84e7db4..2dc1f72 100644 --- a/core/java/android/widget/Editor.java +++ b/core/java/android/widget/Editor.java @@ -1115,7 +1115,6 @@ public class Editor { if (mTemporaryDetach) mPreserveDetachedSelection = false; downgradeEasyCorrectionSpans(); } - // No need to create the controller if (mSelectionModifierCursorController != null) { mSelectionModifierCursorController.resetTouchOffsets(); @@ -1787,7 +1786,7 @@ public class Editor { * * @return true if there already was a selection or if the current word was selected. */ - private boolean checkFieldAndSelectCurrentWord() { + boolean checkFieldAndSelectCurrentWord() { if (!mTextView.canSelectText() || !mTextView.requestFocus()) { Log.w(TextView.LOG_TAG, "TextView does not support text selection. Selection cancelled."); @@ -1834,7 +1833,7 @@ public class Editor { return selectionStarted; } - private boolean extractedTextModeWillBeStarted() { + boolean extractedTextModeWillBeStarted() { if (!(mTextView.isInExtractedMode())) { final InputMethodManager imm = InputMethodManager.peekInstance(); return imm != null && imm.isFullscreenMode(); diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java index 422511f..7025a46 100644 --- a/core/java/android/widget/TextView.java +++ b/core/java/android/widget/TextView.java @@ -5226,7 +5226,11 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener // - onFocusChanged cannot start it when focus is given to a view with selected text (after // a screen rotation) since layout is not yet initialized at that point. if (mEditor != null && mEditor.mCreatedWithASelection) { - mEditor.startSelectionActionMode(); + if (mEditor.extractedTextModeWillBeStarted()) { + mEditor.checkFieldAndSelectCurrentWord(); + } else { + mEditor.startSelectionActionMode(); + } mEditor.mCreatedWithASelection = false; } |