From 791ad4d568fc686c8204334b512e469dd91c2ca5 Mon Sep 17 00:00:00 2001 From: Raff Tsai Date: Thu, 26 Dec 2019 11:56:35 +0800 Subject: [PATCH] Sync lastest SettingsLib interface Test: rebuild Change-Id: I3131f701deb47acae9f19436cbe66e077ea004ee --- .../fuelgauge/BatteryBroadcastReceiver.java | 2 +- src/com/android/settings/fuelgauge/BatteryInfo.java | 10 ++++------ .../fuelgauge/BatteryBroadcastReceiverTest.java | 13 ++++++------- 3 files changed, 11 insertions(+), 14 deletions(-) diff --git a/src/com/android/settings/fuelgauge/BatteryBroadcastReceiver.java b/src/com/android/settings/fuelgauge/BatteryBroadcastReceiver.java index 026668905a6..99510a25d5a 100644 --- a/src/com/android/settings/fuelgauge/BatteryBroadcastReceiver.java +++ b/src/com/android/settings/fuelgauge/BatteryBroadcastReceiver.java @@ -102,7 +102,7 @@ public class BatteryBroadcastReceiver extends BroadcastReceiver { if (Intent.ACTION_BATTERY_CHANGED.equals(intent.getAction())) { final String batteryLevel = Utils.getBatteryPercentage(intent); final String batteryStatus = Utils.getBatteryStatus( - mContext.getResources(), intent); + mContext, intent); if (forceUpdate) { mBatteryListener.onBatteryChanged(BatteryUpdateType.MANUAL); } else if(!batteryLevel.equals(mBatteryLevel)) { diff --git a/src/com/android/settings/fuelgauge/BatteryInfo.java b/src/com/android/settings/fuelgauge/BatteryInfo.java index ab03b6503f3..1935c35218c 100644 --- a/src/com/android/settings/fuelgauge/BatteryInfo.java +++ b/src/com/android/settings/fuelgauge/BatteryInfo.java @@ -133,7 +133,7 @@ public class BatteryInfo { remaining = context.getString(R.string.remaining_length_format, Formatter.formatShortElapsedTime(context, remainingTimeUs / 1000)); } - view.setBottomLabels(new CharSequence[] {timeString, remaining}); + view.setBottomLabels(new CharSequence[]{timeString, remaining}); } public static void getBatteryInfo(final Context context, final Callback callback) { @@ -232,9 +232,8 @@ public class BatteryInfo { info.batteryPercentString = Utils.formatPercentage(info.batteryLevel); info.mCharging = batteryBroadcast.getIntExtra(BatteryManager.EXTRA_PLUGGED, 0) != 0; info.averageTimeToDischarge = estimate.getAverageDischargeTime(); - final Resources resources = context.getResources(); - info.statusLabel = Utils.getBatteryStatus(resources, batteryBroadcast); + info.statusLabel = Utils.getBatteryStatus(context, batteryBroadcast); if (!info.mCharging) { updateBatteryInfoDischarging(context, shortString, estimate, info); } else { @@ -261,12 +260,11 @@ public class BatteryInfo { R.string.power_remaining_charging_duration_only, timeString); info.chargeLabel = context.getString(resId, info.batteryPercentString, timeString); } else { - final String chargeStatusLabel = resources.getString( - R.string.battery_info_status_charging_lower); + final String chargeStatusLabel = Utils.getBatteryStatus(context, batteryBroadcast); info.remainingLabel = null; info.chargeLabel = info.batteryLevel == 100 ? info.batteryPercentString : resources.getString(R.string.power_charging, info.batteryPercentString, - chargeStatusLabel); + chargeStatusLabel.toLowerCase()); } } diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryBroadcastReceiverTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryBroadcastReceiverTest.java index cdbbf7e23a4..4d5f1a07b3e 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryBroadcastReceiverTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryBroadcastReceiverTest.java @@ -42,7 +42,6 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; - import org.robolectric.annotation.Config; @RunWith(RobolectricTestRunner.class) @@ -73,7 +72,7 @@ public class BatteryBroadcastReceiverTest { mChargingIntent.putExtra(BatteryManager.EXTRA_LEVEL, BATTERY_INTENT_LEVEL); mChargingIntent.putExtra(BatteryManager.EXTRA_SCALE, BATTERY_INTENT_SCALE); mChargingIntent - .putExtra(BatteryManager.EXTRA_STATUS, BatteryManager.BATTERY_STATUS_CHARGING); + .putExtra(BatteryManager.EXTRA_STATUS, BatteryManager.BATTERY_STATUS_CHARGING); } @Test @@ -85,9 +84,9 @@ public class BatteryBroadcastReceiverTest { mBatteryBroadcastReceiver.onReceive(mContext, mChargingIntent); assertThat(mBatteryBroadcastReceiver.mBatteryLevel) - .isEqualTo(Utils.getBatteryPercentage(mChargingIntent)); + .isEqualTo(Utils.getBatteryPercentage(mChargingIntent)); assertThat(mBatteryBroadcastReceiver.mBatteryStatus) - .isEqualTo(Utils.getBatteryStatus(mContext.getResources(), mChargingIntent)); + .isEqualTo(Utils.getBatteryStatus(mContext, mChargingIntent)); verify(mBatteryListener).onBatteryChanged(BatteryUpdateType.BATTERY_LEVEL); } @@ -111,7 +110,7 @@ public class BatteryBroadcastReceiverTest { public void testOnReceive_batteryDataNotChanged_listenerNotInvoked() { final String batteryLevel = Utils.getBatteryPercentage(mChargingIntent); final String batteryStatus = - Utils.getBatteryStatus(mContext.getResources(), mChargingIntent); + Utils.getBatteryStatus(mContext, mChargingIntent); mBatteryBroadcastReceiver.mBatteryLevel = batteryLevel; mBatteryBroadcastReceiver.mBatteryStatus = batteryStatus; @@ -134,9 +133,9 @@ public class BatteryBroadcastReceiverTest { mBatteryBroadcastReceiver.register(); assertThat(mBatteryBroadcastReceiver.mBatteryLevel) - .isEqualTo(Utils.getBatteryPercentage(mChargingIntent)); + .isEqualTo(Utils.getBatteryPercentage(mChargingIntent)); assertThat(mBatteryBroadcastReceiver.mBatteryStatus) - .isEqualTo(Utils.getBatteryStatus(mContext.getResources(), mChargingIntent)); + .isEqualTo(Utils.getBatteryStatus(mContext, mChargingIntent)); // 2 times because register will force update the battery verify(mBatteryListener, times(2)).onBatteryChanged(BatteryUpdateType.MANUAL); }