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

Fix summary for system components which 30 sec <= usage time < 1 min.

Browse Source 
- formatElapsedTimeWithoutComma(withSecords = false,) will round up minutes by adding 30 seconds.
https://screenshot.googleplex.com/8HrDpLi8FX8tjJy

Bug: 321265878
Test: Manual
Change-Id: I779bd7c33bbb3aefa0a88f6ba42d047259bc50cc
This commit is contained in:
mxyyiyi
2024-04-02 14:19:08 +08:00
parent 077158e2a6
commit 52672ca34b
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -670,7 +670,7 @@ public class BatteryUtils {
long timeInMs, long timeInMs,
final int lessThanOneMinuteResId, final int lessThanOneMinuteResId,
final int normalResId) { final int normalResId) {
if (timeInMs < DateUtils.MINUTE_IN_MILLIS) { if (timeInMs <= DateUtils.MINUTE_IN_MILLIS / 2) {
return context.getString(lessThanOneMinuteResId); return context.getString(lessThanOneMinuteResId);
} }
final CharSequence timeSequence = final CharSequence timeSequence =

9
tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryUsageBreakdownControllerTest.java
View File

@@ -57,6 +57,7 @@ public final class BatteryUsageBreakdownControllerTest {
private static final String PREF_KEY = "pref_key"; private static final String PREF_KEY = "pref_key";
private static final String PREF_KEY2 = "pref_key2"; private static final String PREF_KEY2 = "pref_key2";
private static final String PREF_SUMMARY = "fake preference summary"; private static final String PREF_SUMMARY = "fake preference summary";
private static final long TIME_LESS_THAN_HALF_MINUTE = DateUtils.MINUTE_IN_MILLIS / 2 - 1;
@Mock private InstrumentedPreferenceFragment mFragment; @Mock private InstrumentedPreferenceFragment mFragment;
@Mock private SettingsActivity mSettingsActivity; @Mock private SettingsActivity mSettingsActivity;
@@ -332,7 +333,7 @@ public final class BatteryUsageBreakdownControllerTest {
createBatteryDiffEntry( createBatteryDiffEntry(
/* isSystem= */ true, /* isSystem= */ true,
/* screenOnTimeInMs= */ 0, /* screenOnTimeInMs= */ 0,
/* foregroundUsageTimeInMs= */ DateUtils.MINUTE_IN_MILLIS - 1, /* foregroundUsageTimeInMs= */ TIME_LESS_THAN_HALF_MINUTE,
/* foregroundServiceUsageTimeInMs= */ 0, /* foregroundServiceUsageTimeInMs= */ 0,
/* backgroundUsageTimeInMs= */ 0)); /* backgroundUsageTimeInMs= */ 0));
assertThat(pref.getSummary().toString()).isEqualTo("Total: less than a minute"); assertThat(pref.getSummary().toString()).isEqualTo("Total: less than a minute");
@@ -427,10 +428,10 @@ public final class BatteryUsageBreakdownControllerTest {
pref, pref,
createBatteryDiffEntry( createBatteryDiffEntry(
/* isSystem= */ false, /* isSystem= */ false,
/* screenOnTimeInMs= */ DateUtils.MINUTE_IN_MILLIS - 1, /* screenOnTimeInMs= */ TIME_LESS_THAN_HALF_MINUTE,
/* foregroundUsageTimeInMs= */ DateUtils.MINUTE_IN_MILLIS - 1, /* foregroundUsageTimeInMs= */ TIME_LESS_THAN_HALF_MINUTE,
/* foregroundServiceUsageTimeInMs= */ 0, /* foregroundServiceUsageTimeInMs= */ 0,
/* backgroundUsageTimeInMs= */ DateUtils.MINUTE_IN_MILLIS - 1)); /* backgroundUsageTimeInMs= */ TIME_LESS_THAN_HALF_MINUTE));
assertThat(pref.getSummary().toString()) assertThat(pref.getSummary().toString())
.isEqualTo("Screen time: less than a minute\nBackground: less than a minute"); .isEqualTo("Screen time: less than a minute\nBackground: less than a minute");
} }