PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update string for all defenders" into tm-qpr-dev am: d388dc1809 am: cf8ab7eef3

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20743066

Change-Id: I3ef80837be675684e595f47cfe886a198992d167
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
YK Hung
2022-12-16 06:04:43 +00:00
committed by Automerger Merge Worker
parent f8b8835761 cf8ab7eef3
commit a8e2ded389
5 changed files with 20 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoTest.java
View File

@@ -65,8 +65,8 @@ public class BatteryInfoTest {
private static final String STATUS_CHARGING_NO_TIME = "50% - charging";
private static final String STATUS_CHARGING_TIME = "50% - 0 min left until full";
private static final String STATUS_NOT_CHARGING = "Not charging";
private static final String STATUS_CHARGING_FUTURE_BYPASS = "50% - Charging to 12%";
private static final String STATUS_CHARGING_PAUSED = "50% - Charging paused";
private static final String STATUS_CHARGING_FUTURE_BYPASS = "50% - Charging optimized";
private static final String STATUS_CHARGING_PAUSED = "50% - Charging optimized";
private static final long REMAINING_TIME_NULL = -1;
private static final long REMAINING_TIME = 2;
// Strings are defined in frameworks/base/packages/SettingsLib/res/values/strings.xml