Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Don't dismiss AutoCompleteTextView on focus change while temp detached" into lmp-mr1-dev

Browse Source
This commit is contained in:
Alan Viverette
2014-11-13 22:45:10 +00:00
committed by Android (Google) Code Review
parent 3fbb55c906 df68999dc7
commit 24859ba016
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/widget/AutoCompleteTextView.java
View File

@@ -1005,6 +1005,12 @@ public class AutoCompleteTextView extends EditText implements Filter.FilterListe
@Override @Override
protected void onFocusChanged(boolean focused, int direction, Rect previouslyFocusedRect) { protected void onFocusChanged(boolean focused, int direction, Rect previouslyFocusedRect) {
super.onFocusChanged(focused, direction, previouslyFocusedRect); super.onFocusChanged(focused, direction, previouslyFocusedRect);
if (mTemporaryDetach) {
// If we are temporarily in the detach state, then do nothing.
return;
}
// Perform validation if the view is losing focus. // Perform validation if the view is losing focus.
if (!focused) { if (!focused) {
performValidation(); performValidation();

4
core/java/android/widget/TextView.java
View File

@@ -287,9 +287,11 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
private int mCurTextColor; private int mCurTextColor;
private int mCurHintTextColor; private int mCurHintTextColor;
private boolean mFreezesText; private boolean mFreezesText;
private boolean mTemporaryDetach;
private boolean mDispatchTemporaryDetach; private boolean mDispatchTemporaryDetach;
/** Whether this view is temporarily detached from the parent view. */
boolean mTemporaryDetach;
private Editable.Factory mEditableFactory = Editable.Factory.getInstance(); private Editable.Factory mEditableFactory = Editable.Factory.getInstance();
private Spannable.Factory mSpannableFactory = Spannable.Factory.getInstance(); private Spannable.Factory mSpannableFactory = Spannable.Factory.getInstance();