Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 3ab249cc: Merge "Fixing memory leak in PreferenceScreen." into honeycomb

Browse Source 
* commit '3ab249cc32b2b94b8d4fcb2775e5b97285c48623':
  Fixing memory leak in PreferenceScreen.
This commit is contained in:
Brad Fitzpatrick
2011-01-18 13:28:56 -08:00
committed by Android Git Automerger
parent 1b67fec7e1 3ab249cc32
commit fe3846707b
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/java/android/preference/PreferenceScreen.java
View File

@@ -80,6 +80,8 @@ public final class PreferenceScreen extends PreferenceGroup implements AdapterVi
private ListAdapter mRootAdapter;
private Dialog mDialog;
private ListView mListView;
/**
* Do NOT use this constructor, use {@link PreferenceManager#createPreferenceScreen(Context)}.
@@ -146,15 +148,18 @@ public final class PreferenceScreen extends PreferenceGroup implements AdapterVi
private void showDialog(Bundle state) {
Context context = getContext();
ListView listView = new ListView(context);
bind(listView);
if (mListView != null) {
mListView.setAdapter(null);
}
mListView = new ListView(context);
bind(mListView);
// Set the title bar if title is available, else no title bar
final CharSequence title = getTitle();
Dialog dialog = mDialog = new Dialog(context, TextUtils.isEmpty(title)
? com.android.internal.R.style.Theme_NoTitleBar
: com.android.internal.R.style.Theme);
dialog.setContentView(listView);
dialog.setContentView(mListView);
if (!TextUtils.isEmpty(title)) {
dialog.setTitle(title);
}