Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 96dacf36 authored by Alan Viverette's avatar Alan Viverette Committed by Android Git Automerger
Browse files

am 24859ba0: Merge "Don\'t dismiss AutoCompleteTextView on focus change while... 

am 24859ba0: Merge "Don\'t dismiss AutoCompleteTextView on focus change while temp detached" into lmp-mr1-dev

* commit '24859ba0':
  Don't dismiss AutoCompleteTextView on focus change while temp detached
parents d200288a 24859ba0

core/java/android/widget/AutoCompleteTextView.java

+6 −0
Original line number Diff line number Diff line
@@ -1005,6 +1005,12 @@ public class AutoCompleteTextView extends EditText implements Filter.FilterListe 
    @Override

    protected void onFocusChanged(boolean focused, int direction, Rect 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.

        if (!focused) {

            performValidation();

core/java/android/widget/TextView.java

+3 −1
Original line number Diff line number Diff line
@@ -287,9 +287,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();