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

Commit 9e4c8561 authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change I8d48149c into eclair

* changes:
  Don't reinflate search bar when dialog is already showing
parents 9830a4ac 11f09bb5
Loading
Loading
Loading
Loading
+5 −3
Original line number Diff line number Diff line
@@ -364,10 +364,12 @@ public class SearchDialog extends Dialog implements OnItemClickListener, OnItemS
        mGlobalSearchMode = globalSearch || searchManager.isDefaultSearchable(mSearchable);
        mActivityContext = mSearchable.getActivityContext(getContext());

        createContentView();

        // show the dialog. this will call onStart().
        if (!isShowing()) {
            // Recreate the search bar view every time the dialog is shown, to get rid
            // of any bad state in the AutoCompleteTextView etc
            createContentView();

            // The Dialog uses a ContextThemeWrapper for the context; use this to change the
            // theme out from underneath us, between the global search theme and the in-app
            // search theme. They are identical except that the global search theme does not