Add adaptive charging to the top level settings menu
Bug: 172009945
Test: Trigger adaptive charging and verify string in menu
Change-Id: Iba2d81e779e2b4aaa3c7b7c38710a03c6792c4a9
Merged-In: Iba2d81e779e2b4aaa3c7b7c38710a03c6792c4a9
(cherry picked from commit b60870cb7ded393cd4bd7edd22e0c6fc2ce0b4bd)
diff --git a/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java b/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java
index 9066444..11d7564 100644
--- a/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java
+++ b/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java
@@ -52,7 +52,8 @@
* Controller that update the battery header view
*/
public class BatteryHeaderPreferenceController extends BasePreferenceController
- implements PreferenceControllerMixin, LifecycleObserver, OnStart {
+ implements PreferenceControllerMixin, LifecycleObserver, OnStart,
+ BatteryPreferenceController {
@VisibleForTesting
static final String KEY_BATTERY_HEADER = "battery_header";
private static final String ANNOTATION_URL = "url";
@@ -121,16 +122,20 @@
.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)) {
- if (BatteryUtils.isBatteryDefenderOn(info)) {
- mSummary1.setText(null);
- } else if (info.remainingLabel == null) {
- mSummary1.setText(info.statusLabel);
- } else {
- mSummary1.setText(info.remainingLabel);
- }
+ mSummary1.setText(generateLabel(info));
}
mBatteryMeterView.setBatteryLevel(info.batteryLevel);
@@ -141,8 +146,8 @@
/**
* Callback which receives text for the summary line.
*/
- public void updateBatteryStatus(String statusLabel) {
- mSummary1.setText(statusLabel);
+ public void updateBatteryStatus(String label, BatteryInfo info) {
+ mSummary1.setText(label != null ? label : generateLabel(info));
}
public void quickUpdateHeaderPreference() {
diff --git a/src/com/android/settings/fuelgauge/BatteryPreferenceController.java b/src/com/android/settings/fuelgauge/BatteryPreferenceController.java
new file mode 100644
index 0000000..badf5c8
--- /dev/null
+++ b/src/com/android/settings/fuelgauge/BatteryPreferenceController.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.fuelgauge;
+
+/**
+ * Common interface for a preference controller that updates battery status
+ */
+public interface BatteryPreferenceController {
+
+ /**
+ * Updates the label for the preference controller. If the label is null, the
+ * implementation should revert back to the original label based on the
+ * battery info.
+ */
+ void updateBatteryStatus(String label, BatteryInfo info);
+}
diff --git a/src/com/android/settings/fuelgauge/BatteryStatusFeatureProvider.java b/src/com/android/settings/fuelgauge/BatteryStatusFeatureProvider.java
index c3fc247..46f00c7 100644
--- a/src/com/android/settings/fuelgauge/BatteryStatusFeatureProvider.java
+++ b/src/com/android/settings/fuelgauge/BatteryStatusFeatureProvider.java
@@ -25,5 +25,5 @@
* Trigger a battery status update; return false if built-in status should be used.
*/
boolean triggerBatteryStatusUpdate(
- BatteryHeaderPreferenceController batteryHeaderPreferenceController, BatteryInfo info);
+ BatteryPreferenceController controller, BatteryInfo info);
}
diff --git a/src/com/android/settings/fuelgauge/BatteryStatusFeatureProviderImpl.java b/src/com/android/settings/fuelgauge/BatteryStatusFeatureProviderImpl.java
index 47d376d..dc4b5db 100644
--- a/src/com/android/settings/fuelgauge/BatteryStatusFeatureProviderImpl.java
+++ b/src/com/android/settings/fuelgauge/BatteryStatusFeatureProviderImpl.java
@@ -31,7 +31,7 @@
@Override
public boolean triggerBatteryStatusUpdate(
- BatteryHeaderPreferenceController batteryHeaderPreferenceController, BatteryInfo info) {
+ BatteryPreferenceController controller, BatteryInfo info) {
return false;
}
}
diff --git a/src/com/android/settings/fuelgauge/TopLevelBatteryPreferenceController.java b/src/com/android/settings/fuelgauge/TopLevelBatteryPreferenceController.java
index e428d49..99eb05d 100644
--- a/src/com/android/settings/fuelgauge/TopLevelBatteryPreferenceController.java
+++ b/src/com/android/settings/fuelgauge/TopLevelBatteryPreferenceController.java
@@ -24,18 +24,21 @@
import com.android.settings.R;
import com.android.settings.core.BasePreferenceController;
+import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnStart;
import com.android.settingslib.core.lifecycle.events.OnStop;
public class TopLevelBatteryPreferenceController extends BasePreferenceController implements
- LifecycleObserver, OnStart, OnStop {
+ LifecycleObserver, OnStart, OnStop, BatteryPreferenceController {
@VisibleForTesting
- boolean mIsBatteryPresent = true;
+ protected boolean mIsBatteryPresent = true;
private final BatteryBroadcastReceiver mBatteryBroadcastReceiver;
private Preference mPreference;
private BatteryInfo mBatteryInfo;
+ private BatteryStatusFeatureProvider mBatteryStatusFeatureProvider;
+ private String mBatteryStatusLabel;
public TopLevelBatteryPreferenceController(Context context, String preferenceKey) {
super(context, preferenceKey);
@@ -49,6 +52,9 @@
updateState(mPreference);
}, true /* shortString */);
});
+
+ mBatteryStatusFeatureProvider = FeatureFactory.getFactory(context)
+ .getBatteryStatusFeatureProvider(context);
}
@Override
@@ -75,27 +81,56 @@
@Override
public CharSequence getSummary() {
+ return getSummary(true /* batteryStatusUpdate */);
+ }
+
+ private CharSequence getSummary(boolean batteryStatusUpdate) {
// Display help message if battery is not present.
if (!mIsBatteryPresent) {
return mContext.getText(R.string.battery_missing_message);
}
- return getDashboardLabel(mContext, mBatteryInfo);
+ return getDashboardLabel(mContext, mBatteryInfo, batteryStatusUpdate);
}
- static CharSequence getDashboardLabel(Context context, BatteryInfo info) {
+ protected CharSequence getDashboardLabel(Context context, BatteryInfo info,
+ boolean batteryStatusUpdate) {
if (info == null || context == null) {
return null;
}
- CharSequence label;
+
+ if (batteryStatusUpdate) {
+ if (!mBatteryStatusFeatureProvider.triggerBatteryStatusUpdate(this, info)) {
+ mBatteryStatusLabel = null; // will generateLabel()
+ }
+ }
+
+ return (mBatteryStatusLabel == null) ? generateLabel(info) : mBatteryStatusLabel;
+ }
+
+ private CharSequence generateLabel(BatteryInfo info) {
if (!info.discharging && info.chargeLabel != null) {
- label = info.chargeLabel;
+ return info.chargeLabel;
} else if (info.remainingLabel == null) {
- label = info.batteryPercentString;
+ return info.batteryPercentString;
} else {
- label = context.getString(R.string.power_remaining_settings_home_page,
+ return mContext.getString(R.string.power_remaining_settings_home_page,
info.batteryPercentString,
info.remainingLabel);
}
- return label;
+ }
+
+ /**
+ * Callback which receives text for the label.
+ */
+ public void updateBatteryStatus(String label, BatteryInfo info) {
+ mBatteryStatusLabel = label; // Null if adaptive charging is not active
+
+ if (mPreference != null) {
+ // Do not triggerBatteryStatusUpdate(), otherwise there will be an infinite loop
+ final CharSequence summary = getSummary(false /* batteryStatusUpdate */);
+ if (summary != null) {
+ mPreference.setSummary(summary);
+ }
+ }
}
}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/TopLevelBatteryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/TopLevelBatteryPreferenceControllerTest.java
index 10893c9..1a3c98f 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/TopLevelBatteryPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/TopLevelBatteryPreferenceControllerTest.java
@@ -18,7 +18,6 @@
import static com.android.settings.core.BasePreferenceController.AVAILABLE;
import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE;
-import static com.android.settings.fuelgauge.TopLevelBatteryPreferenceController.getDashboardLabel;
import static com.google.common.truth.Truth.assertThat;
@@ -59,14 +58,16 @@
public void getDashboardLabel_returnsCorrectLabel() {
BatteryInfo info = new BatteryInfo();
info.batteryPercentString = "3%";
- assertThat(getDashboardLabel(mContext, info)).isEqualTo(info.batteryPercentString);
+ assertThat(mController.getDashboardLabel(mContext, info, true))
+ .isEqualTo(info.batteryPercentString);
info.remainingLabel = "Phone will shut down soon";
- assertThat(getDashboardLabel(mContext, info)).isEqualTo("3% - Phone will shut down soon");
+ assertThat(mController.getDashboardLabel(mContext, info, true))
+ .isEqualTo("3% - Phone will shut down soon");
info.discharging = false;
info.chargeLabel = "5% - charging";
- assertThat(getDashboardLabel(mContext, info)).isEqualTo("5% - charging");
+ assertThat(mController.getDashboardLabel(mContext, info, true)).isEqualTo("5% - charging");
}
@Test