diff --git a/res-product/values/strings.xml b/res-product/values/strings.xml index 1467a4db0b6..d149707fbb3 100644 --- a/res-product/values/strings.xml +++ b/res-product/values/strings.xml @@ -572,17 +572,11 @@ Limit battery for apps that you don\u2019t use often - Usage numbers are proportional to battery usage since last full charge and usage data is not measured when phone is charging + Battery usage and screen time are not measured while the phone is charging - Usage numbers are proportional to battery usage since last full charge and usage data is not measured when tablet is charging + Battery usage and screen time are not measured while the tablet is charging - Usage numbers are proportional to battery usage since last full charge and usage data is not measured when device is charging - - Usage numbers are proportional to battery usage of %s and usage data is not measured when phone is charging - - Usage numbers are proportional to battery usage of %s and usage data is not measured when tablet is charging - - Usage numbers are proportional to battery usage of %s and usage data is not measured when device is charging + Battery usage and screen time are not measured while the device is charging Install certificates from storage diff --git a/src/com/android/settings/fuelgauge/batteryusage/BatteryUsageBreakdownController.java b/src/com/android/settings/fuelgauge/batteryusage/BatteryUsageBreakdownController.java index d44f2669c1d..d4701d0ad75 100644 --- a/src/com/android/settings/fuelgauge/batteryusage/BatteryUsageBreakdownController.java +++ b/src/com/android/settings/fuelgauge/batteryusage/BatteryUsageBreakdownController.java @@ -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); }