Merge "Update adaptive preference summary" into sc-v2-dev am: 6ff60d7771
am: e6a10f3487
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15981706 Change-Id: If760aaa0006cadb1f5cbb999b977ffe719dfb6d7
This commit is contained in:
@@ -6293,6 +6293,8 @@
|
|||||||
|
|
||||||
<!-- Summary for battery manager when it is on -->
|
<!-- Summary for battery manager when it is on -->
|
||||||
<string name="battery_manager_summary">Detecting when apps drain battery</string>
|
<string name="battery_manager_summary">Detecting when apps drain battery</string>
|
||||||
|
<!-- Summary for battery manager when it is on. [CHAR LIMIT=NONE] -->
|
||||||
|
<string name="battery_manager_summary_unsupported">Detecting when apps drain battery</string>
|
||||||
|
|
||||||
<!-- Summary for battery manager when it is off -->
|
<!-- Summary for battery manager when it is off -->
|
||||||
<string name="battery_manager_off">Off</string>
|
<string name="battery_manager_off">Off</string>
|
||||||
|
@@ -133,6 +133,11 @@ public interface PowerUsageFeatureProvider {
|
|||||||
*/
|
*/
|
||||||
boolean isChartGraphSlotsEnabled(Context context);
|
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.
|
* Gets a intent for one time bypass charge limited to resume charging.
|
||||||
*/
|
*/
|
||||||
|
@@ -147,6 +147,11 @@ public class PowerUsageFeatureProviderImpl implements PowerUsageFeatureProvider
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean isAdaptiveChargingSupported() {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Intent getResumeChargeIntent() {
|
public Intent getResumeChargeIntent() {
|
||||||
return null;
|
return null;
|
||||||
|
@@ -64,7 +64,10 @@ public class BatteryManagerPreferenceController extends BasePreferenceController
|
|||||||
preference.setSummary(mContext.getResources().getQuantityString(
|
preference.setSummary(mContext.getResources().getQuantityString(
|
||||||
R.plurals.battery_manager_app_restricted, num, num));
|
R.plurals.battery_manager_app_restricted, num, num));
|
||||||
} else {
|
} else {
|
||||||
preference.setSummary(R.string.battery_manager_summary);
|
preference.setSummary(
|
||||||
|
mPowerUsageFeatureProvider.isAdaptiveChargingSupported()
|
||||||
|
? R.string.battery_manager_summary
|
||||||
|
: R.string.battery_manager_summary_unsupported);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -126,6 +126,11 @@ public class PowerUsageFeatureProviderImplTest {
|
|||||||
assertThat(mPowerFeatureProvider.isSmartBatterySupported()).isFalse();
|
assertThat(mPowerFeatureProvider.isSmartBatterySupported()).isFalse();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testIsAdaptiveChargingSupported_returnFalse() {
|
||||||
|
assertThat(mPowerFeatureProvider.isAdaptiveChargingSupported()).isFalse();
|
||||||
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void testGetResumeChargeIntent_returnNull() {
|
public void testGetResumeChargeIntent_returnNull() {
|
||||||
assertThat(mPowerFeatureProvider.getResumeChargeIntent()).isNull();
|
assertThat(mPowerFeatureProvider.getResumeChargeIntent()).isNull();
|
||||||
|
Reference in New Issue
Block a user