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

Commit 711734a2 authored by Gilles Debunne's avatar Gilles Debunne
Browse files

AutoComplete list does not hide the IME when it re-appears. 

Bug 3415891

With the current behavior, as soon as the list is expanded by
'long' pressing on or scrolling its content, it will always further appear
in its long state, thus hiding the IME.

This fix changes this behavior so that the default state is always
compact, not hiding the IME, and an explicit expansion
is always required.

Also fixes a bug in ListPopupWindow that prevented the timer that
expands the list from being started.

Change-Id: I896e92d54961769c10b276c36f6510e91ff096a2
parent a4a5758b

core/java/android/widget/AutoCompleteTextView.java

+6 −2
Original line number Diff line number Diff line
@@ -204,7 +204,7 @@ public class AutoCompleteTextView extends EditText implements Filter.FilterListe 
    private void onClickImpl() {

        // If the dropdown is showing, bring the keyboard to the front

        // when the user touches the text field.

        if (mPopup.isShowing()) {

        if (isPopupShowing()) {

            ensureImeVisible(true);

        }

    }
@@ -1008,7 +1008,7 @@ public class AutoCompleteTextView extends EditText implements Filter.FilterListe 
    protected boolean setFrame(final int l, int t, final int r, int b) {

        boolean result = super.setFrame(l, t, r, b);



        if (mPopup.isShowing()) {

        if (isPopupShowing()) {

            showDropDown();

        }
@@ -1054,6 +1054,10 @@ public class AutoCompleteTextView extends EditText implements Filter.FilterListe 
                mPopup.setAnchorView(this);

            }

        }

        if (!isPopupShowing()) {

            // Make sure the list does not obscure the IME when shown for the first time.

            mPopup.setInputMethodMode(ListPopupWindow.INPUT_METHOD_NEEDED);

        }

        mPopup.show();

    }

core/java/android/widget/ListPopupWindow.java

+3 −3
Original line number Diff line number Diff line
@@ -26,10 +26,10 @@ import android.util.Log; 
import android.view.KeyEvent;

import android.view.MotionEvent;

import android.view.View;

import android.view.ViewGroup;

import android.view.ViewParent;

import android.view.View.MeasureSpec;

import android.view.View.OnTouchListener;

import android.view.ViewGroup;

import android.view.ViewParent;



/**

 * A ListPopupWindow anchors itself to a host view and displays a
@@ -1222,7 +1222,7 @@ public class ListPopupWindow { 
            

            if (action == MotionEvent.ACTION_DOWN &&

                    mPopup != null && mPopup.isShowing() &&

                    (x >= 0 && x < getWidth() && y >= 0 && y < getHeight())) {

                    (x >= 0 && x < mPopup.getWidth() && y >= 0 && y < mPopup.getHeight())) {

                mHandler.postDelayed(mResizePopupRunnable, EXPAND_LIST_TIMEOUT);

            } else if (action == MotionEvent.ACTION_UP) {

                mHandler.removeCallbacks(mResizePopupRunnable);