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

Update battery summary

Browse Source 
When it is charging, show "5% - charging"(not only "5%")

Bug: 112013485
Test: RunSettingsRoboTests
Change-Id: If2299cc4929d8fc40d63669b74590fafe39122dc
This commit is contained in:
jackqdyulei
2019-02-14 19:11:10 -08:00
parent 1de961d9ef
commit ef3b364728
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/fuelgauge/TopLevelBatteryPreferenceController.java
View File

@@ -80,7 +80,9 @@ public class TopLevelBatteryPreferenceController extends BasePreferenceControlle
} }
CharSequence label; CharSequence label;
final BidiFormatter formatter = BidiFormatter.getInstance(); final BidiFormatter formatter = BidiFormatter.getInstance();
if (info.remainingLabel == null) { if (!info.discharging && info.chargeLabel != null) {
label = info.chargeLabel;
} else if (info.remainingLabel == null) {
label = info.batteryPercentString; label = info.batteryPercentString;
} else { } else {
label = context.getString(R.string.power_remaining_settings_home_page, label = context.getString(R.string.power_remaining_settings_home_page,

4
tests/robotests/src/com/android/settings/fuelgauge/TopLevelBatteryPreferenceControllerTest.java
View File

@@ -61,5 +61,9 @@ public class TopLevelBatteryPreferenceControllerTest {
info.remainingLabel = "Phone will shut down soon"; info.remainingLabel = "Phone will shut down soon";
assertThat(getDashboardLabel(mContext, info)).isEqualTo("3% - Phone will shut down soon"); assertThat(getDashboardLabel(mContext, info)).isEqualTo("3% - Phone will shut down soon");
info.discharging = false;
info.chargeLabel = "5% - charging";
assertThat(getDashboardLabel(mContext, info)).isEqualTo("5% - charging");
} }
} }