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

Merge "Make Settings battery entries support dock charging" into tm-qpr-dev am: 80e36dbbf7

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

Change-Id: I87ce3381132cced3b2c125f749651b82d329e353
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2022-05-25 11:25:14 +00:00
committed by Automerger Merge Worker
parent 1178811b87 80e36dbbf7
commit 4f2dfc5c36
3 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1134,6 +1134,8 @@
<string name="battery_info_status_charging_slow">Charging slowly</string> <string name="battery_info_status_charging_slow">Charging slowly</string>
<!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging wirelessly. --> <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging wirelessly. -->
<string name="battery_info_status_charging_wireless">Charging wirelessly</string> <string name="battery_info_status_charging_wireless">Charging wirelessly</string>
<!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when the device is dock charging. -->
<string name="battery_info_status_charging_dock">Charging Dock</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_discharging">Not charging</string> <string name="battery_info_status_discharging">Not charging</string>
<!-- Battery Info screen. Value for a status item. A state which device is connected with any charger(e.g. USB, Adapter or Wireless) but not charging yet. Used for diagnostic info screens, precise translation isn't needed --> <!-- Battery Info screen. Value for a status item. A state which device is connected with any charger(e.g. USB, Adapter or Wireless) but not charging yet. Used for diagnostic info screens, precise translation isn't needed -->

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

@@ -239,6 +239,8 @@ public class Utils {
statusString = res.getString(R.string.battery_info_status_charging); statusString = res.getString(R.string.battery_info_status_charging);
break; break;
} }
} else if (batteryStatus.isPluggedInDock()) {
statusString = res.getString(R.string.battery_info_status_charging_dock);
} else { } else {
statusString = res.getString(R.string.battery_info_status_charging_wireless); statusString = res.getString(R.string.battery_info_status_charging_wireless);
} }

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

@@ -364,6 +364,17 @@ public class UtilsTest {
resources.getString(R.string.battery_info_status_charging)); resources.getString(R.string.battery_info_status_charging));
} }
@Test
public void getBatteryStatus_chargingDock_returnDockChargingString() {
final Intent intent = new Intent();
intent.putExtra(BatteryManager.EXTRA_STATUS, BatteryManager.BATTERY_STATUS_CHARGING);
intent.putExtra(BatteryManager.EXTRA_PLUGGED, BatteryManager.BATTERY_PLUGGED_DOCK);
final Resources resources = mContext.getResources();
assertThat(Utils.getBatteryStatus(mContext, intent, /* compactStatus= */ false)).isEqualTo(
resources.getString(R.string.battery_info_status_charging_dock));
}
@Test @Test
public void getBatteryStatus_chargingWireless_returnWirelessChargingString() { public void getBatteryStatus_chargingWireless_returnWirelessChargingString() {
final Intent intent = new Intent(); final Intent intent = new Intent();