Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Reprioritize AOD battery info" into sc-qpr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-09-09 15:28:18 +00:00
committed by Android (Google) Code Review
parent 7b682e29dc c67c64f4a0
commit fb26e84c5e
2 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java
View File

@@ -723,15 +723,13 @@ public class KeyguardIndicationController {
} }
protected String computePowerIndication() { protected String computePowerIndication() {
if (mPowerCharged) {
return mContext.getResources().getString(R.string.keyguard_charged);
}
int chargingId; int chargingId;
String percentage = NumberFormat.getPercentInstance().format(mBatteryLevel / 100f);
if (mBatteryOverheated) { if (mBatteryOverheated) {
chargingId = R.string.keyguard_plugged_in_charging_limited; chargingId = R.string.keyguard_plugged_in_charging_limited;
String percentage = NumberFormat.getPercentInstance().format(mBatteryLevel / 100f);
return mContext.getResources().getString(chargingId, percentage); return mContext.getResources().getString(chargingId, percentage);
} else if (mPowerCharged) {
return mContext.getResources().getString(R.string.keyguard_charged);
} }
final boolean hasChargingTime = mChargingTimeRemaining > 0; final boolean hasChargingTime = mChargingTimeRemaining > 0;
@@ -759,6 +757,7 @@ public class KeyguardIndicationController {
: R.string.keyguard_plugged_in_wireless; : R.string.keyguard_plugged_in_wireless;
} }
String percentage = NumberFormat.getPercentInstance().format(mBatteryLevel / 100f);
if (hasChargingTime) { if (hasChargingTime) {
String chargingTimeFormatted = Formatter.formatShortElapsedTimeRoundingUpToMinutes( String chargingTimeFormatted = Formatter.formatShortElapsedTimeRoundingUpToMinutes(
mContext, mChargingTimeRemaining); mContext, mChargingTimeRemaining);

20
packages/SystemUI/tests/src/com/android/systemui/statusbar/KeyguardIndicationControllerTest.java
View File

@@ -639,7 +639,7 @@ public class KeyguardIndicationControllerTest extends SysuiTestCase {
} }
@Test @Test
public void onRefreshBatteryInfo_fullChargedWithOverheat_presentCharged() { public void onRefreshBatteryInfo_fullChargedWithOverheat_presentChargingLimited() {
createController(); createController();
BatteryStatus status = new BatteryStatus(BatteryManager.BATTERY_STATUS_CHARGING, BatteryStatus status = new BatteryStatus(BatteryManager.BATTERY_STATUS_CHARGING,
100 /* level */, BatteryManager.BATTERY_PLUGGED_AC, 100 /* level */, BatteryManager.BATTERY_PLUGGED_AC,
@@ -649,6 +649,24 @@ public class KeyguardIndicationControllerTest extends SysuiTestCase {
mController.getKeyguardCallback().onRefreshBatteryInfo(status); mController.getKeyguardCallback().onRefreshBatteryInfo(status);
mController.setVisible(true); mController.setVisible(true);
verifyIndicationMessage(
INDICATION_TYPE_BATTERY,
mContext.getString(
R.string.keyguard_plugged_in_charging_limited,
NumberFormat.getPercentInstance().format(100 / 100f)));
}
@Test
public void onRefreshBatteryInfo_fullChargedWithoutOverheat_presentCharged() {
createController();
BatteryStatus status = new BatteryStatus(BatteryManager.BATTERY_STATUS_CHARGING,
100 /* level */, BatteryManager.BATTERY_PLUGGED_AC,
BatteryManager.BATTERY_HEALTH_GOOD, 0 /* maxChargingWattage */,
true /* present */);
mController.getKeyguardCallback().onRefreshBatteryInfo(status);
mController.setVisible(true);
verifyIndicationMessage( verifyIndicationMessage(
INDICATION_TYPE_BATTERY, INDICATION_TYPE_BATTERY,
mContext.getString(R.string.keyguard_charged)); mContext.getString(R.string.keyguard_charged));