diff --git a/res/values/strings.xml b/res/values/strings.xml index 84ca836f376..743b61205c7 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -6293,6 +6293,8 @@ Detecting when apps drain battery + + Detecting when apps drain battery Off diff --git a/src/com/android/settings/fuelgauge/PowerUsageFeatureProvider.java b/src/com/android/settings/fuelgauge/PowerUsageFeatureProvider.java index d1d12257134..ef201e440f7 100644 --- a/src/com/android/settings/fuelgauge/PowerUsageFeatureProvider.java +++ b/src/com/android/settings/fuelgauge/PowerUsageFeatureProvider.java @@ -133,6 +133,11 @@ public interface PowerUsageFeatureProvider { */ boolean isChartGraphSlotsEnabled(Context context); + /** + * Checks whether adaptive charging feature is supported in this device + */ + boolean isAdaptiveChargingSupported(); + /** * Gets a intent for one time bypass charge limited to resume charging. */ diff --git a/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImpl.java b/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImpl.java index f4aa1f6c511..81e11b0eee7 100644 --- a/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImpl.java +++ b/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImpl.java @@ -147,6 +147,11 @@ public class PowerUsageFeatureProviderImpl implements PowerUsageFeatureProvider return false; } + @Override + public boolean isAdaptiveChargingSupported() { + return false; + } + @Override public Intent getResumeChargeIntent() { return null; diff --git a/src/com/android/settings/fuelgauge/batterytip/BatteryManagerPreferenceController.java b/src/com/android/settings/fuelgauge/batterytip/BatteryManagerPreferenceController.java index 790264cf313..d920a8ef777 100644 --- a/src/com/android/settings/fuelgauge/batterytip/BatteryManagerPreferenceController.java +++ b/src/com/android/settings/fuelgauge/batterytip/BatteryManagerPreferenceController.java @@ -64,7 +64,10 @@ public class BatteryManagerPreferenceController extends BasePreferenceController preference.setSummary(mContext.getResources().getQuantityString( R.plurals.battery_manager_app_restricted, num, num)); } else { - preference.setSummary(R.string.battery_manager_summary); + preference.setSummary( + mPowerUsageFeatureProvider.isAdaptiveChargingSupported() + ? R.string.battery_manager_summary + : R.string.battery_manager_summary_unsupported); } } } diff --git a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImplTest.java index 21bc255b7b2..d4c4406bd1f 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImplTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImplTest.java @@ -126,6 +126,11 @@ public class PowerUsageFeatureProviderImplTest { assertThat(mPowerFeatureProvider.isSmartBatterySupported()).isFalse(); } + @Test + public void testIsAdaptiveChargingSupported_returnFalse() { + assertThat(mPowerFeatureProvider.isAdaptiveChargingSupported()).isFalse(); + } + @Test public void testGetResumeChargeIntent_returnNull() { assertThat(mPowerFeatureProvider.getResumeChargeIntent()).isNull();