diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/settings/ProgressCategory.java | 16 | ||||
| -rwxr-xr-x | src/com/android/settings/bluetooth/BluetoothSettings.java | 2 |
2 files changed, 12 insertions, 6 deletions
diff --git a/src/com/android/settings/ProgressCategory.java b/src/com/android/settings/ProgressCategory.java index eee19bc..6c74846 100644 --- a/src/com/android/settings/ProgressCategory.java +++ b/src/com/android/settings/ProgressCategory.java @@ -26,12 +26,13 @@ public class ProgressCategory extends ProgressCategoryBase { private boolean mProgress = false; private Preference mNoDeviceFoundPreference; + private boolean mNoDeviceFoundAdded; public ProgressCategory(Context context, AttributeSet attrs) { super(context, attrs); setLayoutResource(R.layout.preference_progress_category); } - + @Override public void onBindView(View view) { super.onBindView(view); @@ -39,21 +40,26 @@ public class ProgressCategory extends ProgressCategoryBase { final View progressBar = view.findViewById(R.id.scanning_progress); textView.setText(mProgress ? R.string.progress_scanning : R.string.progress_tap_to_pair); - boolean noDeviceFound = getPreferenceCount() == 0; + boolean noDeviceFound = (getPreferenceCount() == 0 || + (getPreferenceCount() == 1 && getPreference(0) == mNoDeviceFoundPreference)); textView.setVisibility(noDeviceFound ? View.INVISIBLE : View.VISIBLE); progressBar.setVisibility(mProgress ? View.VISIBLE : View.INVISIBLE); if (mProgress) { - if (mNoDeviceFoundPreference != null) { + if (mNoDeviceFoundAdded) { removePreference(mNoDeviceFoundPreference); + mNoDeviceFoundAdded = false; } } else { - if (noDeviceFound) { + if (noDeviceFound && !mNoDeviceFoundAdded) { if (mNoDeviceFoundPreference == null) { mNoDeviceFoundPreference = new Preference(getContext()); - mNoDeviceFoundPreference.setSummary(R.string.bluetooth_no_devices_found); + mNoDeviceFoundPreference.setLayoutResource(R.layout.preference_empty_list); + mNoDeviceFoundPreference.setTitle(R.string.bluetooth_no_devices_found); + mNoDeviceFoundPreference.setSelectable(false); } addPreference(mNoDeviceFoundPreference); + mNoDeviceFoundAdded = true; } } } diff --git a/src/com/android/settings/bluetooth/BluetoothSettings.java b/src/com/android/settings/bluetooth/BluetoothSettings.java index e18e48a..6899bc3 100755 --- a/src/com/android/settings/bluetooth/BluetoothSettings.java +++ b/src/com/android/settings/bluetooth/BluetoothSettings.java @@ -99,8 +99,8 @@ public final class BluetoothSettings extends DeviceListPreferenceFragment { @Override public void onActivityCreated(Bundle savedInstanceState) { - mActivityStarted = true; super.onActivityCreated(savedInstanceState); + mActivityStarted = (savedInstanceState == null); // don't auto start scan after rotation mEmptyView = (TextView) getView().findViewById(android.R.id.empty); getListView().setEmptyView(mEmptyView); |