From 4137253658f8ee3315c570a8953619650f2c8a07 Mon Sep 17 00:00:00 2001 From: "Wesley.CW Wang" Date: Tue, 5 Oct 2021 17:50:53 +0800 Subject: [PATCH] Update adaptive preference summary Bug: 195627250 Test: make RunSettingsRoboTests Change-Id: I50ed736bbba7ac8d3d6fcf026e9e17e2116f86a7 --- res/values/strings.xml | 2 ++ .../settings/fuelgauge/PowerUsageFeatureProvider.java | 5 +++++ .../settings/fuelgauge/PowerUsageFeatureProviderImpl.java | 5 +++++ .../batterytip/BatteryManagerPreferenceController.java | 5 ++++- .../fuelgauge/PowerUsageFeatureProviderImplTest.java | 5 +++++ 5 files changed, 21 insertions(+), 1 deletion(-) diff --git a/res/values/strings.xml b/res/values/strings.xml index d6f22fbb102..5f2fd54c7dc 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -6283,6 +6283,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 a8e0317ff1d..b6d7efee3cc 100644 --- a/src/com/android/settings/fuelgauge/PowerUsageFeatureProvider.java +++ b/src/com/android/settings/fuelgauge/PowerUsageFeatureProvider.java @@ -139,6 +139,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 e2c7800472c..3f47af4e9fa 100644 --- a/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImpl.java +++ b/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImpl.java @@ -166,6 +166,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 c0b566a5f4b..95cacbbbc0f 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImplTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImplTest.java @@ -156,6 +156,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();