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

Clean up on the charging remaining time label for WLC.

Browse Source 
Bug: 336204618
Test: robotests
Change-Id: Ic2c9d653f8bd9ec25383319766256162d81424c2
This commit is contained in:
Yiling Chuang
2024-04-23 03:36:06 +00:00
parent ce51f659df
commit 1aa4bcf17d
3 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/com/android/settings/fuelgauge/BatteryInfo.java
View File

@@ -433,16 +433,16 @@ public class BatteryInfo {
private static CharSequence getPowerRemainingChargingLabel( private static CharSequence getPowerRemainingChargingLabel(
Context context, Context context,
long remainingTimeMs, long chargeRemainingTimeMs,
boolean isFastCharging, boolean isFastCharging,
int pluggedStatus, int pluggedStatus,
long currentTimeMs) { long currentTimeMs) {
if (pluggedStatus == BatteryManager.BATTERY_PLUGGED_WIRELESS) { if (pluggedStatus == BatteryManager.BATTERY_PLUGGED_WIRELESS) {
BatterySettingsFeatureProvider provider = BatterySettingsFeatureProvider featureProvider =
FeatureFactory.getFeatureFactory().getBatterySettingsFeatureProvider(); FeatureFactory.getFeatureFactory().getBatterySettingsFeatureProvider();
final CharSequence wirelessChargingRemainingLabel = final CharSequence wirelessChargingRemainingLabel =
provider.getWirelessChargingRemainingLabel( featureProvider.getWirelessChargingRemainingLabel(
context, remainingTimeMs, currentTimeMs); context, chargeRemainingTimeMs, currentTimeMs);
if (wirelessChargingRemainingLabel != null) { if (wirelessChargingRemainingLabel != null) {
return wirelessChargingRemainingLabel; return wirelessChargingRemainingLabel;
} }
@@ -453,13 +453,14 @@ public class BatteryInfo {
? R.string.power_remaining_fast_charging_duration_only_v2 ? R.string.power_remaining_fast_charging_duration_only_v2
: R.string.power_remaining_charging_duration_only_v2; : R.string.power_remaining_charging_duration_only_v2;
String timeString = String timeString =
PowerUtil.getTargetTimeShortString(context, remainingTimeMs, currentTimeMs); PowerUtil.getTargetTimeShortString(
context, chargeRemainingTimeMs, currentTimeMs);
return context.getString(chargeLabelResId, timeString); return context.getString(chargeLabelResId, timeString);
} }
final CharSequence timeString = final CharSequence timeString =
StringUtil.formatElapsedTime( StringUtil.formatElapsedTime(
context, context,
remainingTimeMs, chargeRemainingTimeMs,
/* withSeconds= */ false, /* withSeconds= */ false,
/* collapseTimeUnit= */ true); /* collapseTimeUnit= */ true);
return context.getString(R.string.power_remaining_charging_duration_only, timeString); return context.getString(R.string.power_remaining_charging_duration_only, timeString);

2
src/com/android/settings/fuelgauge/BatterySettingsFeatureProvider.java
View File

@@ -49,7 +49,7 @@ public interface BatterySettingsFeatureProvider {
@Nullable @Nullable
CharSequence getWirelessChargingLabel(@NonNull Context context, @NonNull BatteryInfo info); 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 @Nullable
CharSequence getWirelessChargingRemainingLabel( CharSequence getWirelessChargingRemainingLabel(
@NonNull Context context, long remainingTimeMs, long currentTimeMs); @NonNull Context context, long remainingTimeMs, long currentTimeMs);

8
tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoTest.java
View File

@@ -636,15 +636,14 @@ public class BatteryInfoTest {
} }
@Test @Test
public void public void getBatteryInfo_customizedWLCLabel_updateRemainingLabelAndStatusLabel() {
getBatteryInfo_customizedWirelessChargingLabel_updateRemainingLabelAndStatusLabel() {
prepareTestGetBatteryInfoEnvironment( prepareTestGetBatteryInfoEnvironment(
/* remainingTimeMs= */ Duration.ofHours(1).toMillis(), /* remainingTimeMs= */ Duration.ofHours(1).toMillis(),
/* chargingStringV2Enabled= */ true); /* chargingStringV2Enabled= */ true);
Intent batteryIntent = Intent batteryIntent =
createIntentForGetBatteryInfoTest( createIntentForGetBatteryInfoTest(
ChargingType.WIRELESS, ChargingSpeed.REGULAR, /* batteryLevel= */ 45); ChargingType.WIRELESS, ChargingSpeed.REGULAR, /* batteryLevel= */ 45);
CharSequence expectedLabel = "Full by 8:00 AM"; var expectedLabel = "Full by 8:00 AM";
when(mFeatureFactory.batterySettingsFeatureProvider.getWirelessChargingRemainingLabel( when(mFeatureFactory.batterySettingsFeatureProvider.getWirelessChargingRemainingLabel(
eq(mContext), anyLong(), anyLong())) eq(mContext), anyLong(), anyLong()))
.thenReturn(expectedLabel); .thenReturn(expectedLabel);
@@ -663,8 +662,7 @@ public class BatteryInfoTest {
} }
@Test @Test
public void public void getBatteryInfo_noCustomizedWLCLabel_updateRemainingLabelAndStatusLabel() {
getBatteryInfo_noCustomizedWirelessChargingLabel_updateRemainingLabelAndStatusLabel() {
prepareTestGetBatteryInfoEnvironment( prepareTestGetBatteryInfoEnvironment(
/* remainingTimeMs= */ Duration.ofHours(1).toMillis(), /* remainingTimeMs= */ Duration.ofHours(1).toMillis(),
/* chargingStringV2Enabled= */ true); /* chargingStringV2Enabled= */ true);