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

Revert "Add adaptive charging to the top level settings menu"

Browse Source 
Revert submission 12989357-fix_ac_menu

Reason for revert: Bug: 176473169
Reverted Changes:
I6fc50a5ae:Add adaptive charging to the top level settings me...
I8f600287c:Add adaptive charging to the top level settings me...

Change-Id: I2928a96112bb8d2beeb071f231af6595edead4fa
This commit is contained in:
Daniel Chapin
2020-12-29 17:55:13 +00:00
parent 8fee0917f8
commit 2f51836ca1
6 changed files with 23 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -52,8 +52,7 @@ import com.android.settingslib.widget.LayoutPreference;
* Controller that update the battery header view
*/
public class BatteryHeaderPreferenceController extends BasePreferenceController
implements PreferenceControllerMixin, LifecycleObserver, OnStart,
BatteryPreferenceController {
implements PreferenceControllerMixin, LifecycleObserver, OnStart {
@VisibleForTesting
static final String KEY_BATTERY_HEADER = "battery_header";
private static final String ANNOTATION_URL = "url";
@@ -122,20 +121,16 @@ public class BatteryHeaderPreferenceController extends BasePreferenceController
.styleActionBar(mActivity);
}
private CharSequence generateLabel(BatteryInfo info) {
if (BatteryUtils.isBatteryDefenderOn(info)) {
return null;
} else if (info.remainingLabel == null) {
return info.statusLabel;
} else {
return info.remainingLabel;
}
}
public void updateHeaderPreference(BatteryInfo info) {
mBatteryPercentText.setText(formatBatteryPercentageText(info.batteryLevel));
if (!mBatteryStatusFeatureProvider.triggerBatteryStatusUpdate(this, info)) {
mSummary1.setText(generateLabel(info));
if (BatteryUtils.isBatteryDefenderOn(info)) {
mSummary1.setText(null);
} else if (info.remainingLabel == null) {
mSummary1.setText(info.statusLabel);
} else {
mSummary1.setText(info.remainingLabel);
}
}
mBatteryMeterView.setBatteryLevel(info.batteryLevel);
@@ -146,8 +141,8 @@ public class BatteryHeaderPreferenceController extends BasePreferenceController
/**
* Callback which receives text for the summary line.
*/
public void updateBatteryStatus(String label, BatteryInfo info) {
mSummary1.setText(label != null ? label : generateLabel(info));
public void updateBatteryStatus(String statusLabel) {
mSummary1.setText(statusLabel);
}
public void quickUpdateHeaderPreference() {