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

Commit 83131db9 authored by Adam Powell's avatar Adam Powell Committed by Android (Google) Code Review
Browse files

Merge "Fix bug 5358705 - Request no full-screen mode of the IME when a... 

Merge "Fix bug 5358705 - Request no full-screen mode of the IME when a SearchView is expanded in an action bar"
parents c52feae9 53f56c4f

core/java/android/widget/SearchView.java

+4 −0
Original line number Diff line number Diff line
@@ -120,6 +120,7 @@ public class SearchView extends LinearLayout implements CollapsibleActionView { 
    private CharSequence mOldQueryText;

    private CharSequence mUserQuery;

    private boolean mExpandedInActionView;

    private int mCollapsedImeOptions;



    private SearchableInfo mSearchable;

    private Bundle mAppSearchData;
@@ -1166,6 +1167,7 @@ public class SearchView extends LinearLayout implements CollapsibleActionView { 
        clearFocus();

        updateViewsVisibility(true);

        mQueryTextView.setText("");

        mQueryTextView.setImeOptions(mCollapsedImeOptions);

        mExpandedInActionView = false;

    }
@@ -1175,6 +1177,8 @@ public class SearchView extends LinearLayout implements CollapsibleActionView { 
    @Override

    public void onActionViewExpanded() {

        mExpandedInActionView = true;

        mCollapsedImeOptions = mQueryTextView.getImeOptions();

        mQueryTextView.setImeOptions(mCollapsedImeOptions | EditorInfo.IME_FLAG_NO_FULLSCREEN);

        setIconified(false);

    }