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

Merge "Update the strings for "show all apps"" into oc-dev

Browse Source 
am: 4e0f69c10c

Change-Id: I86150368f09801e90263fc099d4e0a703029dac2
This commit is contained in:
jackqdyulei
2017-05-24 00:54:40 +00:00
committed by android-build-merger
parent d327ad395b 4e0f69c10c
commit 6870de6772
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -429,8 +429,9 @@ public class PowerUsageSummary extends PowerUsageBase {
updateLastFullChargePreference(runningTime);
final CharSequence timeSequence = Utils.formatElapsedTime(context, runningTime, false);
mAppListGroup.setTitle(
TextUtils.expandTemplate(getText(R.string.power_usage_list_summary), timeSequence));
final int resId = mShowAllApps ? R.string.power_usage_list_summary_device
: R.string.power_usage_list_summary;
mAppListGroup.setTitle(TextUtils.expandTemplate(getText(resId), timeSequence));
if (averagePower >= MIN_AVERAGE_POWER_THRESHOLD_MILLI_AMP || USE_FAKE_DATA) {
final List<BatterySipper> usageList = getCoalescedUsageList(