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

Merge "Update full charged string (1/2)" into tm-dev

Browse Source
This commit is contained in:
Wesley Wang
2022-02-21 14:10:03 +00:00
committed by Android (Google) Code Review
parent 739267c0d3 9f055464a1
commit 7dd6a1fcbe
3 changed files with 24 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SettingsLib/res/values/strings.xml
View File

@@ -1160,6 +1160,8 @@
<string name="battery_info_status_not_charging">Connected, not charging</string> <string name="battery_info_status_not_charging">Connected, not charging</string>
<!-- Battery Info screen. Value for a status item. Used for diagnostic info screens, precise translation isn't needed --> <!-- Battery Info screen. Value for a status item. Used for diagnostic info screens, precise translation isn't needed -->
<string name="battery_info_status_full">Charged</string> <string name="battery_info_status_full">Charged</string>
<!-- [CHAR_LIMIT=40] Battery Info screen. Value for a status item. A state which device is fully charged -->
<string name="battery_info_status_full_charged">Fully Charged</string>
<!-- Summary for settings preference disabled by administrator [CHAR LIMIT=50] --> <!-- Summary for settings preference disabled by administrator [CHAR LIMIT=50] -->
<string name="disabled_by_admin_summary_text">Controlled by admin</string> <string name="disabled_by_admin_summary_text">Controlled by admin</string>

4
packages/SettingsLib/src/com/android/settingslib/Utils.java
View File

@@ -207,7 +207,9 @@ public class Utils {
final BatteryStatus batteryStatus = new BatteryStatus(batteryChangedIntent); final BatteryStatus batteryStatus = new BatteryStatus(batteryChangedIntent);
if (batteryStatus.isCharged()) { if (batteryStatus.isCharged()) {
statusString = res.getString(R.string.battery_info_status_full); statusString = res.getString(compactStatus
? R.string.battery_info_status_full_charged
: R.string.battery_info_status_full);
} else { } else {
if (status == BatteryManager.BATTERY_STATUS_CHARGING) { if (status == BatteryManager.BATTERY_STATUS_CHARGING) {
if (compactStatus) { if (compactStatus) {

19
packages/SettingsLib/tests/robotests/src/com/android/settingslib/UtilsTest.java
View File

@@ -324,6 +324,15 @@ public class UtilsTest {
resources.getString(R.string.battery_info_status_full)); resources.getString(R.string.battery_info_status_full));
} }
@Test
public void getBatteryStatus_statusIsFullAndUseCompactStatus_returnFullyChargedString() {
final Intent intent = new Intent().putExtra(BatteryManager.EXTRA_LEVEL, 100);
final Resources resources = mContext.getResources();
assertThat(Utils.getBatteryStatus(mContext, intent, /* compactStatus= */ true)).isEqualTo(
resources.getString(R.string.battery_info_status_full_charged));
}
@Test @Test
public void getBatteryStatus_batteryLevelIs100_returnFullString() { public void getBatteryStatus_batteryLevelIs100_returnFullString() {
final Intent intent = new Intent().putExtra(BatteryManager.EXTRA_STATUS, final Intent intent = new Intent().putExtra(BatteryManager.EXTRA_STATUS,
@@ -334,6 +343,16 @@ public class UtilsTest {
resources.getString(R.string.battery_info_status_full)); resources.getString(R.string.battery_info_status_full));
} }
@Test
public void getBatteryStatus_batteryLevelIs100AndUseCompactStatus_returnFullyString() {
final Intent intent = new Intent().putExtra(BatteryManager.EXTRA_STATUS,
BatteryManager.BATTERY_STATUS_FULL);
final Resources resources = mContext.getResources();
assertThat(Utils.getBatteryStatus(mContext, intent, /* compactStatus= */ true)).isEqualTo(
resources.getString(R.string.battery_info_status_full_charged));
}
@Test @Test
public void getBatteryStatus_batteryLevel99_returnChargingString() { public void getBatteryStatus_batteryLevel99_returnChargingString() {
final Intent intent = new Intent(); final Intent intent = new Intent();