From 7c4e04b187f2a067b2b9e4eee4cec3e0bb2e6554 Mon Sep 17 00:00:00 2001
From: timhypeng <timhypeng@google.com>
Date: Thu, 22 Sep 2022 07:10:20 +0000
Subject: [PATCH] single component HFP device has no battery info in the Device
 details page

-get full summary when the metadata does not contain the battery
information
-remove unexpected "test_summary" text

Bug: 237594992
Test: make -j50 RunSettingsGoogleRoboTests ROBOTEST_FILTER=AppBypassBroadcastReceiverTest

Change-Id: I3e3682cf88cdd147d4b7cd68f37f5e33f01c788d
---
 res/layout/advanced_bt_entity_header.xml                    | 3 +--
 .../bluetooth/AdvancedBluetoothDetailsHeaderController.java | 6 +++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/res/layout/advanced_bt_entity_header.xml b/res/layout/advanced_bt_entity_header.xml
index 4aadad1fc34..6dd565f41cb 100644
--- a/res/layout/advanced_bt_entity_header.xml
+++ b/res/layout/advanced_bt_entity_header.xml
@@ -42,8 +42,7 @@
         android:layout_marginTop="2dp"
         android:singleLine="false"
         android:ellipsize="marquee"
-        android:textDirection="locale"
-        android:text="test_summary"/>
+        android:textDirection="locale"/>
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/src/com/android/settings/bluetooth/AdvancedBluetoothDetailsHeaderController.java b/src/com/android/settings/bluetooth/AdvancedBluetoothDetailsHeaderController.java
index 1c12c6a2ed2..c7e74ef4ac3 100644
--- a/src/com/android/settings/bluetooth/AdvancedBluetoothDetailsHeaderController.java
+++ b/src/com/android/settings/bluetooth/AdvancedBluetoothDetailsHeaderController.java
@@ -182,9 +182,9 @@ public class AdvancedBluetoothDetailsHeaderController extends BasePreferenceCont
             final TextView title = mLayoutPreference.findViewById(R.id.entity_header_title);
             title.setText(mCachedDevice.getName());
             final TextView summary = mLayoutPreference.findViewById(R.id.entity_header_summary);
-            summary.setText(mCachedDevice.getConnectionSummary(true /* shortSummary */));
 
             if (!mCachedDevice.isConnected() || mCachedDevice.isBusy()) {
+                summary.setText(mCachedDevice.getConnectionSummary(true /* shortSummary */));
                 updateDisconnectLayout();
                 return;
             }
@@ -196,6 +196,9 @@ public class AdvancedBluetoothDetailsHeaderController extends BasePreferenceCont
                 mLayoutPreference.findViewById(R.id.layout_left).setVisibility(View.GONE);
                 mLayoutPreference.findViewById(R.id.layout_right).setVisibility(View.GONE);
 
+                summary.setText(mCachedDevice.getConnectionSummary(
+                        BluetoothUtils.getIntMetaData(device, BluetoothDevice.METADATA_MAIN_BATTERY)
+                                != BluetoothUtils.META_INT_ERROR));
                 updateSubLayout(mLayoutPreference.findViewById(R.id.layout_middle),
                         BluetoothDevice.METADATA_MAIN_ICON,
                         BluetoothDevice.METADATA_MAIN_BATTERY,
@@ -207,6 +210,7 @@ public class AdvancedBluetoothDetailsHeaderController extends BasePreferenceCont
                     BluetoothDevice.DEVICE_TYPE_UNTETHERED_HEADSET)
                     || BluetoothUtils.getBooleanMetaData(device,
                     BluetoothDevice.METADATA_IS_UNTETHERED_HEADSET)) {
+                summary.setText(mCachedDevice.getConnectionSummary(true /* shortSummary */));
                 updateSubLayout(mLayoutPreference.findViewById(R.id.layout_left),
                         BluetoothDevice.METADATA_UNTETHERED_LEFT_ICON,
                         BluetoothDevice.METADATA_UNTETHERED_LEFT_BATTERY,