Merge "Update the chargeLabel when battery level is full" into oc-dr1-dev am: 1eb2f15339

am: e9d1f6f1ae Change-Id: I1b6ae16aa8899561e240c09eaaa2c89083a70b4a
2017-06-27 18:46:14 +00:00
parent 2f09c9e4c8 e9d1f6f1ae
commit 6b7ff12008
2 changed files with 14 additions and 2 deletions
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoTest.java
@@ -164,4 +164,15 @@ public class BatteryInfoTest {
        assertThat(info.remainingLabel.toString())
                .isEqualTo(TEST_CHARGE_TIME_REMAINING_STRINGIFIED);
    }
+
+    @Test
+    public void testGetBatteryInfo_pluggedInWithFullBattery_onlyShowBatteryLevel() {
+        mChargingBatteryBroadcast.putExtra(BatteryManager.EXTRA_LEVEL, 100);
+
+        BatteryInfo info = BatteryInfo.getBatteryInfo(mContext, mChargingBatteryBroadcast,
+                mBatteryStats, SystemClock.elapsedRealtime() * 1000, false /* shortString */,
+                1000, false /* basedOnUsage */);
+
+        assertThat(info.chargeLabel).isEqualTo("100%");
+    }
 }