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

Merge "Update the chargeLabel when battery level is full" into oc-dr1-dev

Browse Source 
am: 1eb2f15339

Change-Id: I9a1e1f78b34e989a1e56a0e43bf2f40df10a35eb
This commit is contained in:
jackqdyulei
2017-06-26 20:30:26 +00:00
committed by android-build-merger
parent 758b2d4ae6 1eb2f15339
commit e9d1f6f1ae
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -227,8 +227,9 @@ public class BatteryInfo {
final String chargeStatusLabel = resources.getString( final String chargeStatusLabel = resources.getString(
R.string.battery_info_status_charging_lower); R.string.battery_info_status_charging_lower);
info.remainingLabel = null; info.remainingLabel = null;
info.chargeLabel = resources.getString( info.chargeLabel = info.batteryLevel == 100 ? info.batteryPercentString :
R.string.power_charging, info.batteryPercentString, chargeStatusLabel); resources.getString(R.string.power_charging, info.batteryPercentString,
chargeStatusLabel);
} }
} }
return info; return info;

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

@@ -164,4 +164,15 @@ public class BatteryInfoTest {
assertThat(info.remainingLabel.toString()) assertThat(info.remainingLabel.toString())
.isEqualTo(TEST_CHARGE_TIME_REMAINING_STRINGIFIED); .isEqualTo(TEST_CHARGE_TIME_REMAINING_STRINGIFIED);
} }
@Test
public void testGetBatteryInfo_pluggedInWithFullBattery_onlyShowBatteryLevel() {
mChargingBatteryBroadcast.putExtra(BatteryManager.EXTRA_LEVEL, 100);
BatteryInfo info = BatteryInfo.getBatteryInfo(mContext, mChargingBatteryBroadcast,
mBatteryStats, SystemClock.elapsedRealtime() * 1000, false /* shortString */,
1000, false /* basedOnUsage */);
assertThat(info.chargeLabel).isEqualTo("100%");
}
} }