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

Merge "Update battery usage summary" into sc-dev

Browse Source
This commit is contained in:
Wesley Wang
2021-05-10 17:00:07 +00:00
committed by Android (Google) Code Review
parent 333b68d059 8d5010f6ec
commit 56488ef84b
3 changed files with 59 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -52,10 +52,13 @@ import java.util.List;
public class PowerUsageSummary extends PowerUsageBase implements
BatteryTipPreferenceController.BatteryTipListener {
private static final String KEY_BATTERY_ERROR = "battery_help_message";
static final String TAG = "PowerUsageSummary";
@VisibleForTesting
static final String KEY_BATTERY_ERROR = "battery_help_message";
@VisibleForTesting
static final String KEY_BATTERY_USAGE = "battery_usage_summary";
@VisibleForTesting
static final int BATTERY_INFO_LOADER = 1;
@VisibleForTesting
@@ -78,6 +81,8 @@ public class PowerUsageSummary extends PowerUsageBase implements
boolean mNeedUpdateBatteryTip;
@VisibleForTesting
Preference mHelpPreference;
@VisibleForTesting
Preference mBatteryUsagePreference;
@VisibleForTesting
final ContentObserver mSettingsObserver = new ContentObserver(new Handler()) {
@@ -154,12 +159,10 @@ public class PowerUsageSummary extends PowerUsageBase implements
setAnimationAllowed(true);
initFeatureProvider();
initPreference();
mBatteryUtils = BatteryUtils.getInstance(getContext());
mHelpPreference = findPreference(KEY_BATTERY_ERROR);
mHelpPreference.setVisible(false);
if (Utils.isBatteryPresent(getContext())) {
restartBatteryInfoLoader();
} else {
@@ -248,6 +251,18 @@ public class PowerUsageSummary extends PowerUsageBase implements
.getPowerUsageFeatureProvider(context);
}
@VisibleForTesting
void initPreference() {
mBatteryUsagePreference = findPreference(KEY_BATTERY_USAGE);
mBatteryUsagePreference.setSummary(
mPowerFeatureProvider.isChartGraphEnabled(getContext()) ?
getString(R.string.advanced_battery_preference_summary_with_hours) :
getString(R.string.advanced_battery_preference_summary));
mHelpPreference = findPreference(KEY_BATTERY_ERROR);
mHelpPreference.setVisible(false);
}
@VisibleForTesting
void restartBatteryInfoLoader() {
if (getContext() == null) {