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

Merge "Show identity address in the bluetooth details page" am: 5d17cfd938 am: 3ac72d1fd6 am: b99cd8f159

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1952171

Change-Id: I5a3ac49ead905f5b960d53a24eb9ec015a138805
This commit is contained in:
Treehugger Robot
2022-02-15 06:47:55 +00:00
committed by Automerger Merge Worker
parent 6688dc0529 b99cd8f159
commit 1903d00ca1
7 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/android/settings/bluetooth/BluetoothDetailsMacAddressController.java
View File

@@ -46,21 +46,22 @@ public class BluetoothDetailsMacAddressController extends BluetoothDetailsContro
protected void init(PreferenceScreen screen) {
mFooterPreference = screen.findPreference(KEY_DEVICE_DETAILS_FOOTER);
mFooterPreference.setTitle(mContext.getString(
R.string.bluetooth_device_mac_address, mCachedDevice.getAddress()));
R.string.bluetooth_device_mac_address, mCachedDevice.getIdentityAddress()));
}
@Override
protected void refresh() {
if (mCachedDevice.getGroupId() != BluetoothCsipSetCoordinator.GROUP_ID_INVALID) {
StringBuilder title = new StringBuilder(mContext.getString(
R.string.bluetooth_multuple_devices_mac_address, mCachedDevice.getAddress()));
R.string.bluetooth_multuple_devices_mac_address,
mCachedDevice.getIdentityAddress()));
for (CachedBluetoothDevice member: mCachedDevice.getMemberDevice()) {
title.append("\n").append(member.getAddress());
title.append("\n").append(member.getIdentityAddress());
}
mFooterPreference.setTitle(title);
} else {
mFooterPreference.setTitle(mContext.getString(
R.string.bluetooth_device_mac_address, mCachedDevice.getAddress()));
R.string.bluetooth_device_mac_address, mCachedDevice.getIdentityAddress()));
}
}