Fix multiple BT settings bugs.
- Change Bluetooth profiles screen to match ICS wireframes - Remove BluetoothProfilePreference.java (no longer used) - Remove "Pair with this device" summary below every unpaired device - Remove "Paired but not connected" summary below unconnected paired devices - Fix auto connection after pairing (reuse existing CachedBluetoothDevice) - Add "Connected (no phone/media)" summaries based on ICS wireframes - Fix visibility timeout strings. - Fix crash when starting Bluetooth from Settings shortcut widget. Bug: 5064139 Bug: 5064324 Bug: 5080404 Bug: 5093513 Bug: 5104485 Change-Id: Ie87103e183ce414c86cb1831a38ef0178b1b1292
This commit is contained in:
@@ -112,15 +112,11 @@ final class PanProfile implements LocalBluetoothProfile {
|
||||
return ORDINAL;
|
||||
}
|
||||
|
||||
public int getNameResource() {
|
||||
return R.string.bluetooth_profile_pan;
|
||||
}
|
||||
|
||||
public int getDisconnectResource(BluetoothDevice device) {
|
||||
public int getNameResource(BluetoothDevice device) {
|
||||
if (isLocalRoleNap(device)) {
|
||||
return R.string.bluetooth_disconnect_pan_nap_profile;
|
||||
return R.string.bluetooth_profile_pan_nap;
|
||||
} else {
|
||||
return R.string.bluetooth_disconnect_pan_user_profile;
|
||||
return R.string.bluetooth_profile_pan;
|
||||
}
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user