Merge "Refactor compact battery status method (2/2)" (95ae6dac) · Commits · e / os / android_frameworks_base

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

+6 −2

Original line number	Original line	Diff line number	Diff line
	@@ -194,9 +194,11 @@ public class Utils {
	* @param context the context		* @param context the context
	* @param batteryChangedIntent battery broadcast intent received from {@link		* @param batteryChangedIntent battery broadcast intent received from {@link
	* Intent.ACTION_BATTERY_CHANGED}.		* Intent.ACTION_BATTERY_CHANGED}.
			* @param compactStatus to present compact battery charging string if {@code true}
	* @return battery status string		* @return battery status string
	*/		*/
	public static String getBatteryStatus(Context context, Intent batteryChangedIntent) {		public static String getBatteryStatus(Context context, Intent batteryChangedIntent,
			boolean compactStatus) {
	final int status = batteryChangedIntent.getIntExtra(BatteryManager.EXTRA_STATUS,		final int status = batteryChangedIntent.getIntExtra(BatteryManager.EXTRA_STATUS,
	BatteryManager.BATTERY_STATUS_UNKNOWN);		BatteryManager.BATTERY_STATUS_UNKNOWN);
	final Resources res = context.getResources();		final Resources res = context.getResources();
	@@ -208,7 +210,9 @@ public class Utils {
	statusString = res.getString(R.string.battery_info_status_full);		statusString = res.getString(R.string.battery_info_status_full);
	} else {		} else {
	if (status == BatteryManager.BATTERY_STATUS_CHARGING) {		if (status == BatteryManager.BATTERY_STATUS_CHARGING) {
	if (batteryStatus.isPluggedInWired()) {		if (compactStatus) {
			statusString = res.getString(R.string.battery_info_status_charging);
			} else if (batteryStatus.isPluggedInWired()) {
	switch (batteryStatus.getChargingSpeed(context)) {		switch (batteryStatus.getChargingSpeed(context)) {
	case BatteryStatus.CHARGING_FAST:		case BatteryStatus.CHARGING_FAST:
	statusString = res.getString(		statusString = res.getString(

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

+26 −4

Original line number	Original line	Diff line number	Diff line
	@@ -320,7 +320,7 @@ public class UtilsTest {
	final Intent intent = new Intent().putExtra(BatteryManager.EXTRA_LEVEL, 100);		final Intent intent = new Intent().putExtra(BatteryManager.EXTRA_LEVEL, 100);
	final Resources resources = mContext.getResources();		final Resources resources = mContext.getResources();

	assertThat(Utils.getBatteryStatus(mContext, intent)).isEqualTo(		assertThat(Utils.getBatteryStatus(mContext, intent, /* compactStatus= */ false)).isEqualTo(
	resources.getString(R.string.battery_info_status_full));		resources.getString(R.string.battery_info_status_full));
	}		}

	@@ -330,7 +330,7 @@ public class UtilsTest {
	BatteryManager.BATTERY_STATUS_FULL);		BatteryManager.BATTERY_STATUS_FULL);
	final Resources resources = mContext.getResources();		final Resources resources = mContext.getResources();

	assertThat(Utils.getBatteryStatus(mContext, intent)).isEqualTo(		assertThat(Utils.getBatteryStatus(mContext, intent, /* compactStatus= */ false)).isEqualTo(
	resources.getString(R.string.battery_info_status_full));		resources.getString(R.string.battery_info_status_full));
	}		}

	@@ -341,7 +341,7 @@ public class UtilsTest {
	intent.putExtra(BatteryManager.EXTRA_PLUGGED, BatteryManager.BATTERY_PLUGGED_USB);		intent.putExtra(BatteryManager.EXTRA_PLUGGED, BatteryManager.BATTERY_PLUGGED_USB);
	final Resources resources = mContext.getResources();		final Resources resources = mContext.getResources();

	assertThat(Utils.getBatteryStatus(mContext, intent)).isEqualTo(		assertThat(Utils.getBatteryStatus(mContext, intent, /* compactStatus= */ false)).isEqualTo(
	resources.getString(R.string.battery_info_status_charging));		resources.getString(R.string.battery_info_status_charging));
	}		}

	@@ -352,7 +352,29 @@ public class UtilsTest {
	intent.putExtra(BatteryManager.EXTRA_PLUGGED, BatteryManager.BATTERY_PLUGGED_WIRELESS);		intent.putExtra(BatteryManager.EXTRA_PLUGGED, BatteryManager.BATTERY_PLUGGED_WIRELESS);
	final Resources resources = mContext.getResources();		final Resources resources = mContext.getResources();

	assertThat(Utils.getBatteryStatus(mContext, intent)).isEqualTo(		assertThat(Utils.getBatteryStatus(mContext, intent, /* compactStatus= */ false)).isEqualTo(
	resources.getString(R.string.battery_info_status_charging_wireless));		resources.getString(R.string.battery_info_status_charging_wireless));
	}		}

			@Test
			public void getBatteryStatus_chargingAndUseCompactStatus_returnCompactString() {
			final Intent intent = new Intent();
			intent.putExtra(BatteryManager.EXTRA_STATUS, BatteryManager.BATTERY_STATUS_CHARGING);
			intent.putExtra(BatteryManager.EXTRA_PLUGGED, BatteryManager.BATTERY_PLUGGED_USB);
			final Resources resources = mContext.getResources();

			assertThat(Utils.getBatteryStatus(mContext, intent, /* compactStatus= */ true)).isEqualTo(
			resources.getString(R.string.battery_info_status_charging));
			}

			@Test
			public void getBatteryStatus_chargingWirelessAndUseCompactStatus_returnCompactString() {
			final Intent intent = new Intent();
			intent.putExtra(BatteryManager.EXTRA_STATUS, BatteryManager.BATTERY_STATUS_CHARGING);
			intent.putExtra(BatteryManager.EXTRA_PLUGGED, BatteryManager.BATTERY_PLUGGED_WIRELESS);
			final Resources resources = mContext.getResources();

			assertThat(Utils.getBatteryStatus(mContext, intent, /* compactStatus= */ true)).isEqualTo(
			resources.getString(R.string.battery_info_status_charging));
			}
	}		}