PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Add adaptive charging to the top level settings menu"

Browse Source 
Revert submission 12989357-fix_ac_menu

Reason for revert: Bug: 176473169
Reverted Changes:
I6fc50a5ae:Add adaptive charging to the top level settings me...
I8f600287c:Add adaptive charging to the top level settings me...

Change-Id: I2928a96112bb8d2beeb071f231af6595edead4fa
This commit is contained in:
Daniel Chapin
2020-12-29 17:55:13 +00:00
parent 8fee0917f8
commit 2f51836ca1
6 changed files with 23 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
tests/robotests/src/com/android/settings/fuelgauge/TopLevelBatteryPreferenceControllerTest.java
View File

@@ -18,6 +18,7 @@ package com.android.settings.fuelgauge;
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;
@@ -68,16 +69,14 @@ public class TopLevelBatteryPreferenceControllerTest {
public void getDashboardLabel_returnsCorrectLabel() {
BatteryInfo info = new BatteryInfo();
info.batteryPercentString = "3%";
assertThat(mController.getDashboardLabel(mContext, info))
.isEqualTo(info.batteryPercentString);
assertThat(getDashboardLabel(mContext, info)).isEqualTo(info.batteryPercentString);
info.remainingLabel = "Phone will shut down soon";
assertThat(mController.getDashboardLabel(mContext, info))
.isEqualTo("3% - Phone will shut down soon");
assertThat(getDashboardLabel(mContext, info)).isEqualTo("3% - Phone will shut down soon");
info.discharging = false;
info.chargeLabel = "5% - charging";
assertThat(mController.getDashboardLabel(mContext, info)).isEqualTo("5% - charging");
assertThat(getDashboardLabel(mContext, info)).isEqualTo("5% - charging");
}
@Test