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

Merge "Update battery defender tip string" into sc-dev am: 029edb7c48

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

Change-Id: Id714cf519433966edd608cb9f62b9d12b7e5d384
This commit is contained in:
TreeHugger Robot
2021-05-28 02:24:48 +00:00
committed by Automerger Merge Worker
parent 20f3744880 029edb7c48
commit 509a09653b
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/values/strings.xml
View File

@@ -6094,7 +6094,7 @@
<!-- Summary for the battery high usage tip, which presents apps with highest usage [CHAR LIMIT=NONE] -->
<string name="battery_tip_high_usage_summary">See apps with highest usage</string>
<!-- Title for the battery limited temporarily tip [CHAR LIMIT=NONE] -->
<string name="battery_tip_limited_temporarily_title">Optimizing for battery health</string>
<string name="battery_tip_limited_temporarily_title">Charging temporarily limited</string>
<!-- Summary for the battery limited temporarily tip [CHAR LIMIT=NONE] -->
<string name="battery_tip_limited_temporarily_summary">Battery limited temporarily. Learn more.</string>
<!-- Message for battery tip dialog to show the status about the battery [CHAR LIMIT=NONE] -->

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

@@ -258,7 +258,7 @@ public class BatteryInfoTest {
false /* shortString */);
assertThat(info.isOverheated).isTrue();
assertThat(info.chargeLabel).isEqualTo("50% - Optimizing for battery health");
assertThat(info.chargeLabel).isEqualTo("50% - Charging temporarily limited");
}
// Make our battery stats return a sequence of battery events.