Merge "Do not show selection action mode when the TextView is not shown." into mnc-dev

2015-06-26 05:10:33 +00:00
parent f207285d8d 145252f840
commit 084b7a15c9
1 changed files with 1 additions and 1 deletions
--- a/core/java/android/widget/TextView.java
+++ b/core/java/android/widget/TextView.java
@@ -5231,7 +5231,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
        // ExtractEditText does not call onFocus when it is displayed, and mHasSelectionOnFocus can
        // not be set. Do the test here instead.
        if (isInExtractedMode() && hasSelection() && mEditor != null
-                && mEditor.mTextActionMode == null) {
+                && mEditor.mTextActionMode == null && isShown() && hasWindowFocus()) {
            mEditor.startSelectionActionMode();
        }