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 
am: 4e963f8f91

Change-Id: I00e0b8126679815d460336d1cc2b01fc5abf55bd
This commit is contained in:
Salvador Martinez
2017-08-01 20:01:13 +00:00
committed by android-build-merger
parent bbd92b5748 4e963f8f91
commit 6db99201aa
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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) {
mLoader.setSummary(SummaryProvider.this, info.chargeLabel);
}
});
}, true /* shortString */);
});
}