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

Merge "Fix battery percentage is inconsistent in settings" into udc-dev am: 3b60e2a9c3 am: f6ba37e583

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

Change-Id: Ifbc2f697f1c01683bab16227d5a02e9c3044575b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-05-02 14:24:35 +00:00
committed by Automerger Merge Worker
parent 2df5e03bb5 f6ba37e583
commit 1ff9d7cc34
2 changed files with 22 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -141,7 +141,7 @@ public class TopLevelBatteryPreferenceControllerTest {
BatteryInfo info = new BatteryInfo();
assertThat(mController.getDashboardLabel(mContext, info, true))
.isEqualTo(mContext.getString(R.string.battery_tip_incompatible_charging_title));
.isEqualTo(mContext.getString(R.string.battery_info_status_not_charging));
}
@Test