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

Commit 3448b676 authored by Bjorn Bringert's avatar Bjorn Bringert Committed by Android Git Automerger
Browse files

am 9e4c8561: Merge change I8d48149c into eclair 

Merge commit '9e4c8561' into eclair-mr2

* commit '9e4c8561':
  Don't reinflate search bar when dialog is already showing
parents a4a8a88b 9e4c8561

core/java/android/app/SearchDialog.java

+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