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

Commit c76e5669 authored by Amith Yamasani's avatar Amith Yamasani Committed by Android Git Automerger
Browse files

am dab15d14: Merge "Don\'t expand the SearchView if already expanded." into ics-mr1 

* commit 'dab15d14':
  Don't expand the SearchView if already expanded.
parents c89d5279 dab15d14

core/java/android/widget/SearchView.java

+2 −0
Original line number Original line Diff line number Diff line
@@ -1187,6 +1187,8 @@ public class SearchView extends LinearLayout implements CollapsibleActionView { 
     */

     */

    @Override

    @Override

    public void onActionViewExpanded() {

    public void onActionViewExpanded() {

        if (mExpandedInActionView) return;



        mExpandedInActionView = true;

        mExpandedInActionView = true;

        mCollapsedImeOptions = mQueryTextView.getImeOptions();

        mCollapsedImeOptions = mQueryTextView.getImeOptions();

        mQueryTextView.setImeOptions(mCollapsedImeOptions | EditorInfo.IME_FLAG_NO_FULLSCREEN);

        mQueryTextView.setImeOptions(mCollapsedImeOptions | EditorInfo.IME_FLAG_NO_FULLSCREEN);