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

Merge "Support help message when battery is unavailable(1/2)" into sc-dev

Browse Source
This commit is contained in:
Wesley Wang
2021-04-09 04:43:06 +00:00
committed by Android (Google) Code Review
parent a586dc3a96 756028aadd
commit 57f27f7a30
6 changed files with 95 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java
View File

@@ -91,7 +91,7 @@ public class BatteryHeaderPreferenceController extends BasePreferenceController
if (com.android.settings.Utils.isBatteryPresent(mContext)) {
quickUpdateHeaderPreference();
} else {
//TODO(b/179237551): Make new progress bar widget support help message
mBatteryUsageProgressBarPref.setVisible(false);
}
}

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

@@ -29,6 +29,7 @@ import android.provider.Settings.Global;
import androidx.annotation.VisibleForTesting;
import androidx.loader.app.LoaderManager;
import androidx.loader.content.Loader;
import androidx.preference.Preference;
import com.android.settings.R;
import com.android.settings.SettingsActivity;
@@ -51,6 +52,8 @@ 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
@@ -70,9 +73,11 @@ public class PowerUsageSummary extends PowerUsageBase implements
@VisibleForTesting
BatteryHeaderPreferenceController mBatteryHeaderPreferenceController;
@VisibleForTesting
BatteryTipPreferenceController mBatteryTipPreferenceController;
@VisibleForTesting
boolean mNeedUpdateBatteryTip;
@VisibleForTesting
BatteryTipPreferenceController mBatteryTipPreferenceController;
Preference mHelpPreference;
@VisibleForTesting
final ContentObserver mSettingsObserver = new ContentObserver(new Handler()) {
@@ -152,8 +157,14 @@ public class PowerUsageSummary extends PowerUsageBase implements
mBatteryUtils = BatteryUtils.getInstance(getContext());
mHelpPreference = findPreference(KEY_BATTERY_ERROR);
mHelpPreference.setVisible(false);
if (Utils.isBatteryPresent(getContext())) {
restartBatteryInfoLoader();
} else {
// Present help preference when battery is unavailable.
mHelpPreference.setVisible(true);
}
mBatteryTipPreferenceController.restoreInstanceState(icicle);
updateBatteryTipFlag(icicle);