}
mPreserveDetachedSelection = true;
- hideControllers();
+ hideCursorAndSpanControllers();
stopTextActionMode();
mPreserveDetachedSelection = false;
mTemporaryDetach = false;
}
/**
- * Hides the insertion controller and stops text selection mode, hiding the selection controller
+ * Hides the insertion and span controllers.
*/
- void hideControllers() {
+ void hideCursorAndSpanControllers() {
hideCursorControllers();
hideSpanControllers();
}
// ExtractEditText goes out of focus.
final int selStart = mTextView.getSelectionStart();
final int selEnd = mTextView.getSelectionEnd();
- hideControllers();
+ hideCursorAndSpanControllers();
stopTextActionMode();
Selection.setSelection((Spannable) mTextView.getText(), selStart, selEnd);
} else {
if (mTemporaryDetach) mPreserveDetachedSelection = true;
- hideControllers();
+ hideCursorAndSpanControllers();
stopTextActionMode();
if (mTemporaryDetach) mPreserveDetachedSelection = false;
downgradeEasyCorrectionSpans();
mBlink.uncancel();
makeBlink();
}
+ final InputMethodManager imm = InputMethodManager.peekInstance();
+ final boolean immFullScreen = (imm != null && imm.isFullscreenMode());
+ if (mSelectionModifierCursorController != null && mTextView.hasSelection()
+ && !immFullScreen) {
+ mSelectionModifierCursorController.show();
+ }
} else {
if (mBlink != null) {
mBlink.cancel();
mInputContentType.enterDown = false;
}
// Order matters! Must be done before onParentLostFocus to rely on isShowingUp
- hideControllers();
+ hideCursorAndSpanControllers();
+ if (mSelectionModifierCursorController != null) {
+ mSelectionModifierCursorController.hide();
+ }
if (mSuggestionsPopupWindow != null) {
mSuggestionsPopupWindow.onParentLostFocus();
}
void onTouchUpEvent(MotionEvent event) {
boolean selectAllGotFocus = mSelectAllOnFocus && mTextView.didTouchFocusSelect();
- hideControllers();
+ hideCursorAndSpanControllers();
stopTextActionMode();
CharSequence text = mTextView.getText();
if (!selectAllGotFocus && text.length() > 0) {
if (mSuggestionsPopupWindow == null) {
mSuggestionsPopupWindow = new SuggestionsPopupWindow();
}
- hideControllers();
+ hideCursorAndSpanControllers();
stopTextActionMode();
mSuggestionsPopupWindow.show();
}
// 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.
- mEditor.hideControllers();
+ mEditor.hideCursorAndSpanControllers();
stopTextActionMode();
}
protected void onVisibilityChanged(View changedView, int visibility) {
super.onVisibilityChanged(changedView, visibility);
if (mEditor != null && visibility != VISIBLE) {
- mEditor.hideControllers();
+ mEditor.hideCursorAndSpanControllers();
stopTextActionMode();
}
}
// since we are doing so explicitlty by other means and these
// controllers interact with how selection behaves.
if (mEditor != null) {
- mEditor.hideControllers();
+ mEditor.hideCursorAndSpanControllers();
}
CharSequence text = getIterableTextForAccessibility();
if (Math.min(start, end) >= 0 && Math.max(start, end) <= text.length()) {