From 1aa4bcf17d32d66b4bc56164176258f2e1fdac8b Mon Sep 17 00:00:00 2001
From: Yiling Chuang <emilychuang@google.com>
Date: Tue, 23 Apr 2024 03:36:06 +0000
Subject: [PATCH] Clean up on the charging remaining time label for WLC.

Bug: 336204618
Test: robotests
Change-Id: Ic2c9d653f8bd9ec25383319766256162d81424c2
---
 src/com/android/settings/fuelgauge/BatteryInfo.java | 13 +++++++------
 .../fuelgauge/BatterySettingsFeatureProvider.java   |  2 +-
 .../android/settings/fuelgauge/BatteryInfoTest.java |  8 +++-----
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/src/com/android/settings/fuelgauge/BatteryInfo.java b/src/com/android/settings/fuelgauge/BatteryInfo.java
index f71b29138be..66ce8b82d4d 100644
--- a/src/com/android/settings/fuelgauge/BatteryInfo.java
+++ b/src/com/android/settings/fuelgauge/BatteryInfo.java
@@ -433,16 +433,16 @@ public class BatteryInfo {
 
     private static CharSequence getPowerRemainingChargingLabel(
             Context context,
-            long remainingTimeMs,
+            long chargeRemainingTimeMs,
             boolean isFastCharging,
             int pluggedStatus,
             long currentTimeMs) {
         if (pluggedStatus == BatteryManager.BATTERY_PLUGGED_WIRELESS) {
-            BatterySettingsFeatureProvider provider =
+            BatterySettingsFeatureProvider featureProvider =
                     FeatureFactory.getFeatureFactory().getBatterySettingsFeatureProvider();
             final CharSequence wirelessChargingRemainingLabel =
-                    provider.getWirelessChargingRemainingLabel(
-                            context, remainingTimeMs, currentTimeMs);
+                    featureProvider.getWirelessChargingRemainingLabel(
+                            context, chargeRemainingTimeMs, currentTimeMs);
             if (wirelessChargingRemainingLabel != null) {
                 return wirelessChargingRemainingLabel;
             }
@@ -453,13 +453,14 @@ public class BatteryInfo {
                             ? R.string.power_remaining_fast_charging_duration_only_v2
                             : R.string.power_remaining_charging_duration_only_v2;
             String timeString =
-                    PowerUtil.getTargetTimeShortString(context, remainingTimeMs, currentTimeMs);
+                    PowerUtil.getTargetTimeShortString(
+                            context, chargeRemainingTimeMs, currentTimeMs);
             return context.getString(chargeLabelResId, timeString);
         }
         final CharSequence timeString =
                 StringUtil.formatElapsedTime(
                         context,
-                        remainingTimeMs,
+                        chargeRemainingTimeMs,
                         /* withSeconds= */ false,
                         /* collapseTimeUnit= */ true);
         return context.getString(R.string.power_remaining_charging_duration_only, timeString);
diff --git a/src/com/android/settings/fuelgauge/BatterySettingsFeatureProvider.java b/src/com/android/settings/fuelgauge/BatterySettingsFeatureProvider.java
index 3f674ba7471..a1a220d986c 100644
--- a/src/com/android/settings/fuelgauge/BatterySettingsFeatureProvider.java
+++ b/src/com/android/settings/fuelgauge/BatterySettingsFeatureProvider.java
@@ -49,7 +49,7 @@ public interface BatterySettingsFeatureProvider {
     @Nullable
     CharSequence getWirelessChargingLabel(@NonNull Context context, @NonNull BatteryInfo info);
 
-    /** Return a remaining time label for wireless charging. */
+    /** Return a charging remaining time label for wireless charging. */
     @Nullable
     CharSequence getWirelessChargingRemainingLabel(
             @NonNull Context context, long remainingTimeMs, long currentTimeMs);
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoTest.java
index bd5215b399b..ff5c6c53639 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoTest.java
@@ -636,15 +636,14 @@ public class BatteryInfoTest {
     }
 
     @Test
-    public void
-            getBatteryInfo_customizedWirelessChargingLabel_updateRemainingLabelAndStatusLabel() {
+    public void getBatteryInfo_customizedWLCLabel_updateRemainingLabelAndStatusLabel() {
         prepareTestGetBatteryInfoEnvironment(
                 /* remainingTimeMs= */ Duration.ofHours(1).toMillis(),
                 /* chargingStringV2Enabled= */ true);
         Intent batteryIntent =
                 createIntentForGetBatteryInfoTest(
                         ChargingType.WIRELESS, ChargingSpeed.REGULAR, /* batteryLevel= */ 45);
-        CharSequence expectedLabel = "Full by 8:00 AM";
+        var expectedLabel = "Full by 8:00 AM";
         when(mFeatureFactory.batterySettingsFeatureProvider.getWirelessChargingRemainingLabel(
                         eq(mContext), anyLong(), anyLong()))
                 .thenReturn(expectedLabel);
@@ -663,8 +662,7 @@ public class BatteryInfoTest {
     }
 
     @Test
-    public void
-            getBatteryInfo_noCustomizedWirelessChargingLabel_updateRemainingLabelAndStatusLabel() {
+    public void getBatteryInfo_noCustomizedWLCLabel_updateRemainingLabelAndStatusLabel() {
         prepareTestGetBatteryInfoEnvironment(
                 /* remainingTimeMs= */ Duration.ofHours(1).toMillis(),
                 /* chargingStringV2Enabled= */ true);