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

Merge "BT device picker: don't rescan after rotating the device"

Browse Source
This commit is contained in:
Jake Hamby
2011-09-07 14:56:43 -07:00
committed by Android (Google) Code Review
parent 3badeb199f de53b46b16
commit 04cf11c90b
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -45,13 +45,13 @@ public class ProgressCategory extends ProgressCategoryBase {
textView.setVisibility(noDeviceFound ? View.INVISIBLE : View.VISIBLE); textView.setVisibility(noDeviceFound ? View.INVISIBLE : View.VISIBLE);
progressBar.setVisibility(mProgress ? View.VISIBLE : View.INVISIBLE); progressBar.setVisibility(mProgress ? View.VISIBLE : View.INVISIBLE);
if (mProgress) { if (mProgress || !noDeviceFound) {
if (mNoDeviceFoundAdded) { if (mNoDeviceFoundAdded) {
removePreference(mNoDeviceFoundPreference); removePreference(mNoDeviceFoundPreference);
mNoDeviceFoundAdded = false; mNoDeviceFoundAdded = false;
} }
} else { } else {
if (noDeviceFound && !mNoDeviceFoundAdded) { if (!mNoDeviceFoundAdded) {
if (mNoDeviceFoundPreference == null) { if (mNoDeviceFoundPreference == null) {
mNoDeviceFoundPreference = new Preference(getContext()); mNoDeviceFoundPreference = new Preference(getContext());
mNoDeviceFoundPreference.setLayoutResource(R.layout.preference_empty_list); mNoDeviceFoundPreference.setLayoutResource(R.layout.preference_empty_list);
@@ -70,4 +70,3 @@ public class ProgressCategory extends ProgressCategoryBase {
notifyChanged(); notifyChanged();
} }
} }

7
src/com/android/settings/bluetooth/DevicePickerFragment.java
View File

@@ -33,6 +33,7 @@ public final class DevicePickerFragment extends DeviceListPreferenceFragment {
private boolean mNeedAuth; private boolean mNeedAuth;
private String mLaunchPackage; private String mLaunchPackage;
private String mLaunchClass; private String mLaunchClass;
private boolean mStartScanOnResume;
@Override @Override
void addPreferencesForActivity() { void addPreferencesForActivity() {
@@ -50,13 +51,17 @@ public final class DevicePickerFragment extends DeviceListPreferenceFragment {
public void onCreate(Bundle savedInstanceState) { public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
getActivity().setTitle(getString(R.string.device_picker)); getActivity().setTitle(getString(R.string.device_picker));
mStartScanOnResume = (savedInstanceState == null); // don't start scan after rotation
} }
@Override @Override
public void onResume() { public void onResume() {
super.onResume(); super.onResume();
addCachedDevices(); addCachedDevices();
mLocalAdapter.startScanning(true); if (mStartScanOnResume) {
mLocalAdapter.startScanning(true);
mStartScanOnResume = false;
}
} }
@Override @Override