diff options
| author | Alan Viverette <alanv@google.com> | 2014-11-14 00:03:27 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-14 00:03:27 +0000 |
| commit | 8f5de8c6c0d5da3c81670b72d5b412acea502d22 (patch) | |
| tree | a91db7913a5df347a9578a62f323e354a3ceac6c /core/java/android/widget/TextView.java | |
| parent | 57f77e44c18c9ac0b074b377eb9e74a94ef3ab2f (diff) | |
| parent | 96dacf3659c6fe9a1ac509ec242eb446307c6833 (diff) | |
| download | frameworks_base-8f5de8c6c0d5da3c81670b72d5b412acea502d22.zip frameworks_base-8f5de8c6c0d5da3c81670b72d5b412acea502d22.tar.gz frameworks_base-8f5de8c6c0d5da3c81670b72d5b412acea502d22.tar.bz2 | |
am 96dacf36: am 24859ba0: Merge "Don\'t dismiss AutoCompleteTextView on focus change while temp detached" into lmp-mr1-dev
* commit '96dacf3659c6fe9a1ac509ec242eb446307c6833':
Don't dismiss AutoCompleteTextView on focus change while temp detached
Diffstat (limited to 'core/java/android/widget/TextView.java')
| -rw-r--r-- | core/java/android/widget/TextView.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java index 44ccde0..0f9625f 100644 --- a/core/java/android/widget/TextView.java +++ b/core/java/android/widget/TextView.java @@ -286,9 +286,11 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener private int mCurTextColor; private int mCurHintTextColor; private boolean mFreezesText; - private boolean mTemporaryDetach; private boolean mDispatchTemporaryDetach; + /** Whether this view is temporarily detached from the parent view. */ + boolean mTemporaryDetach; + private Editable.Factory mEditableFactory = Editable.Factory.getInstance(); private Spannable.Factory mSpannableFactory = Spannable.Factory.getInstance(); |