diff --git a/res/values/strings.xml b/res/values/strings.xml index 0dd205433f0..86c80c3e6d0 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -1912,6 +1912,8 @@ Device details Device\'s Bluetooth address: %1$s + + Device\'s Bluetooth address:\n%1$s Forget device? diff --git a/src/com/android/settings/bluetooth/BluetoothDetailsMacAddressController.java b/src/com/android/settings/bluetooth/BluetoothDetailsMacAddressController.java index dda247eac52..c5f845371b4 100644 --- a/src/com/android/settings/bluetooth/BluetoothDetailsMacAddressController.java +++ b/src/com/android/settings/bluetooth/BluetoothDetailsMacAddressController.java @@ -16,6 +16,7 @@ package com.android.settings.bluetooth; +import android.bluetooth.BluetoothCsipSetCoordinator; import android.content.Context; import androidx.preference.PreferenceFragmentCompat; @@ -50,8 +51,17 @@ public class BluetoothDetailsMacAddressController extends BluetoothDetailsContro @Override protected void refresh() { - mFooterPreference.setTitle(mContext.getString( + if (mCachedDevice.getGroupId() != BluetoothCsipSetCoordinator.GROUP_ID_INVALID) { + StringBuilder mTitle = new StringBuilder(mContext.getString( + R.string.bluetooth_multuple_devices_mac_address, mCachedDevice.getAddress())); + for (CachedBluetoothDevice member: mCachedDevice.getMemberDevice()) { + mTitle.append("\n").append(member.getAddress()); + } + mFooterPreference.setTitle(mTitle); + } else { + mFooterPreference.setTitle(mContext.getString( R.string.bluetooth_device_mac_address, mCachedDevice.getAddress())); + } } @Override