PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 2876ad62: am 2fcfb289: Merge " Fix Bluetooth Settings activity memory leak."

Browse Source 
Merge commit '2876ad62082207e0e02cbc38b65ce9993cb121bf'

* commit '2876ad62082207e0e02cbc38b65ce9993cb121bf':
  Fix Bluetooth Settings activity memory leak.
This commit is contained in:
Jake Hamby
2010-08-21 09:35:49 -07:00
committed by Android Git Automerger
parent 999d66df26 2876ad6208
commit 2cd6aad561
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/com/android/settings/ProgressCategory.java
View File

@@ -26,7 +26,8 @@ import java.util.Map;
public class ProgressCategory extends PreferenceCategory { public class ProgressCategory extends PreferenceCategory {
private boolean mProgress = false; private boolean mProgress = false;
private View oldView = null;
public ProgressCategory(Context context, AttributeSet attrs) { public ProgressCategory(Context context, AttributeSet attrs) {
super(context, attrs); super(context, attrs);
setLayoutResource(R.layout.preference_progress_category); setLayoutResource(R.layout.preference_progress_category);
@@ -41,6 +42,13 @@ public class ProgressCategory extends PreferenceCategory {
int visibility = mProgress ? View.VISIBLE : View.INVISIBLE; int visibility = mProgress ? View.VISIBLE : View.INVISIBLE;
textView.setVisibility(visibility); textView.setVisibility(visibility);
progressBar.setVisibility(visibility); progressBar.setVisibility(visibility);
if (oldView != null) {
oldView.findViewById(R.id.scanning_progress).setVisibility(View.GONE);
oldView.findViewById(R.id.scanning_text).setVisibility(View.GONE);
oldView.setVisibility(View.GONE);
}
oldView = view;
} }
/** /**

3
src/com/android/settings/bluetooth/BluetoothSettings.java
View File

@@ -212,7 +212,8 @@ public class BluetoothSettings extends PreferenceActivity
super.onPause(); super.onPause();
mLocalManager.setForegroundActivity(null); mLocalManager.setForegroundActivity(null);
mDevicePreferenceMap.clear();
mDeviceList.removeAll();
unregisterReceiver(mReceiver); unregisterReceiver(mReceiver);
mLocalManager.unregisterCallback(this); mLocalManager.unregisterCallback(this);