Merge "Fix: Selection handles can remain on home screen." into mnc-dev

2015-07-01 22:44:48 +00:00
parent 36e52cdcd3 4712b8ef9e
commit f3be3ddfd8
1 changed files with 1 additions and 1 deletions
--- a/core/java/android/widget/Editor.java
+++ b/core/java/android/widget/Editor.java
@@ -1186,7 +1186,7 @@ public class Editor {
            final InputMethodManager imm = InputMethodManager.peekInstance();
            final boolean immFullScreen = (imm != null && imm.isFullscreenMode());
            if (mSelectionModifierCursorController != null && mTextView.hasSelection()
-                    && !immFullScreen) {
+                    && !immFullScreen && mTextActionMode != null) {
                mSelectionModifierCursorController.show();
            }
        } else {