diff options
| author | Seigo Nonaka <nona@google.com> | 2015-06-26 05:10:33 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-26 05:10:35 +0000 |
| commit | 084b7a15c9a1bdbbb64d9921eaeb12235bc5fc17 (patch) | |
| tree | b415c7576d7e295e33d087c00b05f826b071d763 | |
| parent | f207285d8d813730683b0c099edff84ac0b13244 (diff) | |
| parent | 145252f84027babc196a44ae6ff3debbf763ca30 (diff) | |
| download | frameworks_base-084b7a15c9a1bdbbb64d9921eaeb12235bc5fc17.zip frameworks_base-084b7a15c9a1bdbbb64d9921eaeb12235bc5fc17.tar.gz frameworks_base-084b7a15c9a1bdbbb64d9921eaeb12235bc5fc17.tar.bz2 | |
Merge "Do not show selection action mode when the TextView is not shown." into mnc-dev
| -rw-r--r-- | core/java/android/widget/TextView.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java index 6631f26..310b474 100644 --- 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(); } |