drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge change I8d48149c into eclair

Browse Source 
* changes:
  Don't reinflate search bar when dialog is already showing
This commit is contained in:
Android (Google) Code Review
2009-10-05 16:15:14 -04:00
parent 9830a4ac42 11f09bb5cd
commit 9e4c85614c
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/app/SearchDialog.java
View File

@ -364,10 +364,12 @@ public class SearchDialog extends Dialog implements OnItemClickListener, OnItemS
mGlobalSearchMode = globalSearch || searchManager.isDefaultSearchable(mSearchable); mGlobalSearchMode = globalSearch || searchManager.isDefaultSearchable(mSearchable);
mActivityContext = mSearchable.getActivityContext(getContext()); mActivityContext = mSearchable.getActivityContext(getContext());
createContentView();
// show the dialog. this will call onStart(). // show the dialog. this will call onStart().
if (!isShowing()) { 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 // 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 // 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 // search theme. They are identical except that the global search theme does not