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

Merge "Fix b/265364509 Update battery usage page footer string" into udc-dev am: c74a6b4fb0

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21535009

Change-Id: Icd3ee6fc335c5ac6a160197bd408478c55b0ec95
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
YK Hung
2023-02-22 15:40:48 +00:00
committed by Automerger Merge Worker
parent 2b35c6500a c74a6b4fb0
commit de7129a244
2 changed files with 8 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/com/android/settings/fuelgauge/batteryusage/BatteryUsageBreakdownController.java
View File

@@ -194,7 +194,7 @@ public class BatteryUsageBreakdownController extends BasePreferenceController
showCategoryTitle(slotTimestamp);
showSpinnerAndAppList();
showFooterPreference(isAllUsageDataEmpty, slotTimestamp);
showFooterPreference(isAllUsageDataEmpty);
}
private void showCategoryTitle(String slotTimestamp) {
@@ -206,16 +206,11 @@ public class BatteryUsageBreakdownController extends BasePreferenceController
mRootPreference.setVisible(true);
}
private void showFooterPreference(boolean isAllBatteryUsageEmpty, String slotTimestamp) {
mFooterPreference.setTitle(
private void showFooterPreference(boolean isAllBatteryUsageEmpty) {
mFooterPreference.setTitle(mPrefContext.getString(
isAllBatteryUsageEmpty
? mPrefContext.getString(R.string.battery_usage_screen_footer_empty)
: (slotTimestamp == null
? mPrefContext.getString(
R.string.battery_usage_screen_footer_since_last_full_charge)
: mPrefContext.getString(
R.string.battery_usage_screen_footer_of_timestamp,
slotTimestamp)));
? R.string.battery_usage_screen_footer_empty
: R.string.battery_usage_screen_footer));
mFooterPreference.setVisible(true);
}