Add intent action for BT device detail page
Also update detail page to accept cold start:
1. Check whether profile is ready
2. When it is ready, refresh UI
Bug: 123665527
Test: SettingsRoboTests
Change-Id: I39382fd97e9da46fca08cd2e4a3ef15d32703664
diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java
index e7f543a..ae4ae2a 100644
--- a/src/com/android/settings/Settings.java
+++ b/src/com/android/settings/Settings.java
@@ -156,6 +156,7 @@
}
public static class WebViewAppPickerActivity extends SettingsActivity { /* empty */ }
public static class AdvancedConnectedDeviceActivity extends SettingsActivity { /* empty */ }
+ public static class BluetoothDeviceDetailActivity extends SettingsActivity { /* empty */ }
// Top level categories for new IA
public static class NetworkDashboardActivity extends SettingsActivity {}
diff --git a/src/com/android/settings/bluetooth/BluetoothDetailsProfilesController.java b/src/com/android/settings/bluetooth/BluetoothDetailsProfilesController.java
index 5c609e6..749a38f 100644
--- a/src/com/android/settings/bluetooth/BluetoothDetailsProfilesController.java
+++ b/src/com/android/settings/bluetooth/BluetoothDetailsProfilesController.java
@@ -45,7 +45,8 @@
* supports, such as "Phone audio", "Media audio", "Contact sharing", etc.
*/
public class BluetoothDetailsProfilesController extends BluetoothDetailsController
- implements Preference.OnPreferenceClickListener {
+ implements Preference.OnPreferenceClickListener,
+ LocalBluetoothProfileManager.ServiceListener {
private static final String KEY_PROFILES_GROUP = "bluetooth_profiles";
@VisibleForTesting
@@ -87,6 +88,7 @@
pref.setKey(profile.toString());
pref.setTitle(profile.getNameResource(mCachedDevice.getDevice()));
pref.setOnPreferenceClickListener(this);
+ pref.setOrder(profile.getOrdinal());
return pref;
}
@@ -221,7 +223,7 @@
}
BluetoothDevice device = mCachedDevice.getDevice();
A2dpProfile a2dp = (A2dpProfile) profile;
- if (a2dp.supportsHighQualityAudio(device)) {
+ if (a2dp.isProfileReady() && a2dp.supportsHighQualityAudio(device)) {
SwitchPreference highQualityAudioPref = new SwitchPreference(
mProfilesContainer.getContext());
highQualityAudioPref.setKey(HIGH_QUALITY_AUDIO_PREF_TAG);
@@ -235,6 +237,28 @@
}
}
+ @Override
+ public void onPause() {
+ super.onPause();
+ mProfileManager.removeServiceListener(this);
+ }
+
+ @Override
+ public void onResume() {
+ super.onResume();
+ mProfileManager.addServiceListener(this);
+ }
+
+ @Override
+ public void onServiceConnected() {
+ refresh();
+ }
+
+ @Override
+ public void onServiceDisconnected() {
+ refresh();
+ }
+
/**
* Refreshes the state of the switches for all profiles, possibly adding or removing switches as
* needed.
@@ -242,7 +266,10 @@
@Override
protected void refresh() {
for (LocalBluetoothProfile profile : getProfiles()) {
- SwitchPreference pref = (SwitchPreference) mProfilesContainer.findPreference(
+ if (!profile.isProfileReady()) {
+ continue;
+ }
+ SwitchPreference pref = mProfilesContainer.findPreference(
profile.toString());
if (pref == null) {
pref = createProfilePreference(mProfilesContainer.getContext(), profile);
@@ -252,7 +279,7 @@
refreshProfilePreference(pref, profile);
}
for (LocalBluetoothProfile removedProfile : mCachedDevice.getRemovedProfiles()) {
- SwitchPreference pref = (SwitchPreference) mProfilesContainer.findPreference(
+ final SwitchPreference pref = mProfilesContainer.findPreference(
removedProfile.toString());
if (pref != null) {
mProfilesContainer.removePreference(pref);
diff --git a/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragment.java b/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragment.java
index 98455f2..2fbd061 100644
--- a/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragment.java
+++ b/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragment.java
@@ -107,6 +107,11 @@
mDeviceAddress = getArguments().getString(KEY_DEVICE_ADDRESS);
mManager = getLocalBluetoothManager(context);
mCachedDevice = getCachedDevice(mDeviceAddress);
+ if (mCachedDevice == null) {
+ // Close this page if device is null with invalid device mac address
+ finish();
+ return;
+ }
super.onAttach(context);
use(AdvancedBluetoothDetailsHeaderController.class).init(mCachedDevice);