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

Refactor compact battery status method (2/2) am: 1c92783e96

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16961345

Change-Id: Ia951b94ea23e3fab548554d1038fe6d8bf2a65b2
This commit is contained in:
Wesley Wang
2022-02-21 09:50:19 +00:00
committed by Automerger Merge Worker
parent 1ad6646b20 1c92783e96
commit c1ab7e53e5
2 changed files with 32 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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(

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

@@ -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));
}
} }