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

* commit '084b7a15c9a1bdbbb64d9921eaeb12235bc5fc17':
  Do not show selection action mode when the TextView is not shown.
This commit is contained in:
Seigo Nonaka
2015-06-26 05:19:49 +00:00
committed by Android Git Automerger

View File

@@ -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();
}