From 2c6fd8fd3bb2bed7237c463b2d83a57c9e411ae9 Mon Sep 17 00:00:00 2001
From: "Wesley.CW Wang" <wesleycwwang@google.com>
Date: Wed, 12 May 2021 21:05:41 +0800
Subject: [PATCH] Update battery charging status string

 - Present status string only when status anomalous
 - Remove app usage pages divider

Bug: 185448191
Bug: 187767337
Bug: 187778673
Test: make SettingsRoboTests
Change-Id: I7829e9deed05fb7d95d483ddb718abfdc53b1aa6
---
 res/xml/power_usage_detail.xml                        |  6 ++----
 res/xml/power_usage_detail_legacy.xml                 |  6 ++----
 .../fuelgauge/BatteryHeaderPreferenceController.java  |  5 +++--
 src/com/android/settings/fuelgauge/BatteryInfo.java   |  3 +++
 .../BatteryHeaderPreferenceControllerTest.java        | 11 +++++++++++
 5 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/res/xml/power_usage_detail.xml b/res/xml/power_usage_detail.xml
index f40ce7f954b..3481c1ef4b5 100644
--- a/res/xml/power_usage_detail.xml
+++ b/res/xml/power_usage_detail.xml
@@ -22,15 +22,13 @@
     <com.android.settingslib.widget.LayoutPreference
         android:key="header_view"
         android:layout="@layout/settings_entity_header"
-        android:selectable="false"
-        settings:allowDividerBelow="true"/>
+        android:selectable="false"/>
 
     <com.android.settingslib.widget.ActionButtonsPreference
         android:key="action_buttons"/>
 
     <PreferenceCategory
-        android:title="@string/battery_detail_manage_title"
-        settings:allowDividerAbove="true">
+        android:title="@string/battery_detail_manage_title">
 
         <com.android.settingslib.widget.RadioButtonPreference
             android:key="unrestricted_pref"
diff --git a/res/xml/power_usage_detail_legacy.xml b/res/xml/power_usage_detail_legacy.xml
index 5ab0a94695f..50bed8ed55e 100644
--- a/res/xml/power_usage_detail_legacy.xml
+++ b/res/xml/power_usage_detail_legacy.xml
@@ -23,16 +23,14 @@
         android:key="header_view"
         android:layout="@layout/settings_entity_header"
         android:selectable="false"
-        android:order="-10000"
-        settings:allowDividerBelow="true"/>
+        android:order="-10000"/>
 
     <com.android.settingslib.widget.ActionButtonsPreference
         android:key="action_buttons"
         android:order="-9999"/>
 
     <PreferenceCategory
-        android:title="@string/battery_detail_manage_title"
-        settings:allowDividerAbove="true">
+        android:title="@string/battery_detail_manage_title">
 
         <com.android.settingslib.RestrictedPreference
             android:key="background_activity"
diff --git a/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java b/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java
index e895e9a789b..6c792878557 100644
--- a/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java
+++ b/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java
@@ -111,8 +111,9 @@ public class BatteryHeaderPreferenceController extends BasePreferenceController
     private CharSequence generateLabel(BatteryInfo info) {
         if (BatteryUtils.isBatteryDefenderOn(info)) {
             return null;
-        } else if (info.remainingLabel == null) {
-            // Present status independently if no remaining time
+        } else if (info.remainingLabel == null
+                || info.batteryStatus == BatteryManager.BATTERY_STATUS_NOT_CHARGING) {
+            // Present status only if no remaining time or status anomalous
             return info.statusLabel;
         } else if (info.statusLabel != null && !info.discharging) {
             // Charging state
diff --git a/src/com/android/settings/fuelgauge/BatteryInfo.java b/src/com/android/settings/fuelgauge/BatteryInfo.java
index 832936cf6b5..f1b19322856 100644
--- a/src/com/android/settings/fuelgauge/BatteryInfo.java
+++ b/src/com/android/settings/fuelgauge/BatteryInfo.java
@@ -46,6 +46,7 @@ public class BatteryInfo {
     public CharSequence chargeLabel;
     public CharSequence remainingLabel;
     public int batteryLevel;
+    public int batteryStatus;
     public boolean discharging = true;
     public boolean isOverheated;
     public long remainingTimeUs = 0;
@@ -238,6 +239,8 @@ public class BatteryInfo {
                 == BatteryManager.BATTERY_HEALTH_OVERHEAT;
 
         info.statusLabel = Utils.getBatteryStatus(context, batteryBroadcast);
+        info.batteryStatus = batteryBroadcast.getIntExtra(
+                BatteryManager.EXTRA_STATUS, BatteryManager.BATTERY_STATUS_UNKNOWN);
         if (!info.mCharging) {
             updateBatteryInfoDischarging(context, shortString, estimate, info);
         } else {
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java
index ad81d9d30a0..6389dc95fe1 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java
@@ -167,6 +167,17 @@ public class BatteryHeaderPreferenceControllerTest {
         verify(mBatteryUsageProgressBarPref).setBottomSummary(BATTERY_STATUS);
     }
 
+    @Test
+    public void updatePreference_statusAnomalous_showStatusLabel() {
+        mBatteryInfo.remainingLabel = TIME_LEFT;
+        mBatteryInfo.statusLabel = BATTERY_STATUS;
+        mBatteryInfo.batteryStatus = BatteryManager.BATTERY_STATUS_NOT_CHARGING;
+
+        mController.updateHeaderPreference(mBatteryInfo);
+
+        verify(mBatteryUsageProgressBarPref).setBottomSummary(BATTERY_STATUS);
+    }
+
     @Test
     public void updatePreference_charging_showFullText() {
         setChargingState(/* isDischarging */ false, /* updatedByStatusFeature */ false);