| commit | 285952a80ede66d187d96e8c028e1730ee876513 | [log] [tgz] |
|---|---|---|
| author | SongFerng Wang <songferngwang@google.com> | Wed Mar 23 02:11:19 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Mar 23 02:11:19 2022 +0000 |
| tree | 2ca731b9b12cfdfb40d8b813d70ac29730eb04da | |
| parent | 465363a3128e4ffa41b01c482dd745ca6e099a7e [diff] | |
| parent | 75869b5fef47b16fb5f321eb001292f239c298ea [diff] |
Merge "[LE adudio] The condition of right location is wrong." am: 75869b5fef Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2037423 Change-Id: I98125699c5fe13fe7acbd7668be1e12b6bcedcd6
diff --git a/src/com/android/settings/bluetooth/LeAudioBluetoothDetailsHeaderController.java b/src/com/android/settings/bluetooth/LeAudioBluetoothDetailsHeaderController.java index 06cee85..7b74f77 100644 --- a/src/com/android/settings/bluetooth/LeAudioBluetoothDetailsHeaderController.java +++ b/src/com/android/settings/bluetooth/LeAudioBluetoothDetailsHeaderController.java
@@ -275,11 +275,15 @@ return; } boolean isLeft = (deviceId & LEFT_DEVICE_ID) != 0; - boolean isRight = (deviceId & LEFT_DEVICE_ID) != 0; + boolean isRight = (deviceId & RIGHT_DEVICE_ID) != 0; boolean isLeftRight = isLeft && isRight; // The LE device updates the BatteryLayout if (isLeftRight) { - Log.d(TAG, "The device id is left+right. Do nothing."); + Log.d(TAG, "Show the legacy battery style if the device id is left+right."); + final TextView summary = mLayoutPreference.findViewById(R.id.entity_header_summary); + if (summary != null) { + summary.setText(mCachedDevice.getConnectionSummary()); + } } else if (isLeft) { updateBatteryLayout(getBatteryTitleResource(LEFT_DEVICE_ID), getBatterySummaryResource(LEFT_DEVICE_ID), cachedDevice.getBatteryLevel());