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

Browse Source
This commit is contained in:
TreeHugger Robot
2017-08-01 19:45:59 +00:00
committed by Android (Google) Code Review
parent 7fbfda67da dcb96058ef
commit 4e963f8f91
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -219,9 +219,7 @@ public class BatteryInfo {
CharSequence timeString = Utils.formatElapsedTime(context, CharSequence timeString = Utils.formatElapsedTime(context,
BatteryUtils.convertUsToMs(drainTimeUs), false /* withSeconds */); BatteryUtils.convertUsToMs(drainTimeUs), false /* withSeconds */);
info.remainingLabel = TextUtils.expandTemplate(context.getText(shortString ? info.remainingLabel = TextUtils.expandTemplate(context.getText(shortString ?
(basedOnUsage ? R.string.power_remaining_duration_only_short :
R.string.power_remaining_duration_only_short_enhanced :
R.string.power_remaining_duration_only_short) :
(basedOnUsage ? (basedOnUsage ?
R.string.power_remaining_duration_only_enhanced : R.string.power_remaining_duration_only_enhanced :
R.string.power_remaining_duration_only)), timeString); R.string.power_remaining_duration_only)), timeString);

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

@@ -887,7 +887,7 @@ public class PowerUsageSummary extends PowerUsageBase implements
public void onBatteryInfoLoaded(BatteryInfo info) { public void onBatteryInfoLoaded(BatteryInfo info) {
mLoader.setSummary(SummaryProvider.this, info.chargeLabel); mLoader.setSummary(SummaryProvider.this, info.chargeLabel);
} }
}); }, true /* shortString */);
}); });
} }

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

@@ -131,7 +131,7 @@ public class BatteryInfoTest {
} }
@Test @Test
public void testGetBatteryInfo_basedOnUsageTrue_usesUsageString() { public void testGetBatteryInfo_basedOnUsageTrue_usesCorrectString() {
BatteryInfo info = BatteryInfo.getBatteryInfo(mContext, mDisChargingBatteryBroadcast, BatteryInfo info = BatteryInfo.getBatteryInfo(mContext, mDisChargingBatteryBroadcast,
mBatteryStats, SystemClock.elapsedRealtime() * 1000, false /* shortString */, mBatteryStats, SystemClock.elapsedRealtime() * 1000, false /* shortString */,
1000, true /* basedOnUsage */); 1000, true /* basedOnUsage */);
@@ -139,8 +139,10 @@ public class BatteryInfoTest {
mBatteryStats, SystemClock.elapsedRealtime() * 1000, true /* shortString */, mBatteryStats, SystemClock.elapsedRealtime() * 1000, true /* shortString */,
1000, true /* basedOnUsage */); 1000, true /* basedOnUsage */);
// We only add special mention for the long string
assertThat(info.remainingLabel.toString()).contains(ENHANCED_STRING_SUFFIX); 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 @Test