Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6ff60d77 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Update adaptive preference summary" into sc-v2-dev

parents 14139de0 41372536

res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -6283,6 +6283,8 @@ 














    <!-- Summary for battery manager when it is on -->















    <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 -->















    <string name="battery_manager_off">Off</string>

























src/com/android/settings/fuelgauge/PowerUsageFeatureProvider.java



+5
−0






























Original line number
Diff line number
Diff line








@@ -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.















     */

































src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImpl.java



+5
−0






























Original line number
Diff line number
Diff line








@@ -166,6 +166,11 @@ public class PowerUsageFeatureProviderImpl implements PowerUsageFeatureProvider













        return false;















    }





























    @Override













    public boolean isAdaptiveChargingSupported() {













        return false;













    }





























    @Override















    public Intent getResumeChargeIntent() {















        return null;

































src/com/android/settings/fuelgauge/batterytip/BatteryManagerPreferenceController.java



+4
−1






























Original line number
Diff line number
Diff line








@@ -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);















        }















    }















}
























tests/robotests/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImplTest.java



+5
−0






























Original line number
Diff line number
Diff line








@@ -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();