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

Merge "Shorten main settings battery string" into oc-mr1-dev am: 4e963f8f91

Browse Source 
am: 6db99201aa

Change-Id: I82bf5cfe72cfd8ec774c6c7d21c17bd946163903
This commit is contained in:
Salvador Martinez
2017-08-01 20:15:41 +00:00
committed by android-build-merger
parent 16e0ef2b7d 6db99201aa
commit fec50f4248
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -131,7 +131,7 @@ public class BatteryInfoTest {
}
@Test
public void testGetBatteryInfo_basedOnUsageTrue_usesUsageString() {
public void testGetBatteryInfo_basedOnUsageTrue_usesCorrectString() {
BatteryInfo info = BatteryInfo.getBatteryInfo(mContext, mDisChargingBatteryBroadcast,
mBatteryStats, SystemClock.elapsedRealtime() * 1000, false /* shortString */,
1000, true /* basedOnUsage */);
@@ -139,8 +139,10 @@ public class BatteryInfoTest {
mBatteryStats, SystemClock.elapsedRealtime() * 1000, true /* shortString */,
1000, true /* basedOnUsage */);
// We only add special mention for the long string
assertThat(info.remainingLabel.toString()).contains(ENHANCED_STRING_SUFFIX);
assertThat(info2.remainingLabel.toString()).contains(ENHANCED_STRING_SUFFIX);
// shortened string should not have extra text
assertThat(info2.remainingLabel.toString()).doesNotContain(ENHANCED_STRING_SUFFIX);
}
@Test