Merge "Update full charged string (1/2)" into tm-dev (7dd6a1fc) · Commits · e / os / android_frameworks_base

packages/SettingsLib/res/values/strings.xml

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -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>

packages/SettingsLib/src/com/android/settingslib/Utils.java

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -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) {

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

+19 −0

Original line number	Original line	Diff line number	Diff line
	@@ -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();