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

Merge "Update strings when shortString is true" into oc-mr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-08-23 19:38:40 +00:00
committed by Android (Google) Code Review
parent a097d68c4b ae4b79ee6d
commit d0066e3875
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -243,8 +243,7 @@ public class BatteryInfo {
info.remainingTimeUs = chargeTime; info.remainingTimeUs = chargeTime;
CharSequence timeString = Utils.formatElapsedTime(context, CharSequence timeString = Utils.formatElapsedTime(context,
BatteryUtils.convertUsToMs(chargeTime), false /* withSeconds */); BatteryUtils.convertUsToMs(chargeTime), false /* withSeconds */);
int resId = shortString ? R.string.power_charging_duration_short int resId = R.string.power_charging_duration;
: R.string.power_charging_duration;
info.remainingLabel = TextUtils.expandTemplate(context.getText( info.remainingLabel = TextUtils.expandTemplate(context.getText(
R.string.power_remaining_charging_duration_only), timeString); R.string.power_remaining_charging_duration_only), timeString);
info.chargeLabel = TextUtils.expandTemplate(context.getText(resId), info.chargeLabel = TextUtils.expandTemplate(context.getText(resId),

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

@@ -123,11 +123,14 @@ public class BatteryInfoTest {
} }
@Test @Test
public void testGetBatteryInfo_pluggedIn_dischargingFalse() { public void testGetBatteryInfo_pluggedInUsingShortString_usesCorrectData() {
doReturn(TEST_CHARGE_TIME_REMAINING).when(mBatteryStats).computeChargeTimeRemaining(
anyLong());
BatteryInfo info = BatteryInfo.getBatteryInfoOld(mContext, mChargingBatteryBroadcast, BatteryInfo info = BatteryInfo.getBatteryInfoOld(mContext, mChargingBatteryBroadcast,
mBatteryStats, SystemClock.elapsedRealtime() * 1000, true /* shortString */); mBatteryStats, SystemClock.elapsedRealtime() * 1000, true /* shortString */);
assertThat(info.discharging).isEqualTo(false); assertThat(info.discharging).isEqualTo(false);
assertThat(info.chargeLabel.toString()).isEqualTo("50% - 1m until fully charged");
} }
@Test @Test