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

Merge "[Reskin] Update string of incompatible charging on settings" into main

Browse Source
This commit is contained in:
YK Hung
2024-01-16 16:29:10 +00:00
committed by Android (Google) Code Review
parent 3c71a5ff22 fe96aee940
commit a8fa24ccd5
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/fuelgauge/TopLevelBatteryPreferenceController.java
View File

@@ -151,7 +151,8 @@ public class TopLevelBatteryPreferenceController extends BasePreferenceControlle
private CharSequence generateLabel(BatteryInfo info) { private CharSequence generateLabel(BatteryInfo info) {
if (Utils.containsIncompatibleChargers(mContext, TAG)) { if (Utils.containsIncompatibleChargers(mContext, TAG)) {
return mContext.getString( return mContext.getString(
com.android.settingslib.R.string.battery_info_status_not_charging); com.android.settingslib.R.string.power_incompatible_charging_settings_home_page,
info.batteryPercentString);
} }
if (BatteryUtils.isBatteryDefenderOn(info)) { if (BatteryUtils.isBatteryDefenderOn(info)) {
return mContext.getString( return mContext.getString(

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

@@ -130,11 +130,14 @@ public class TopLevelBatteryPreferenceControllerTest {
BatteryTestUtils.setupIncompatibleEvent(mUsbPort, mUsbManager, mUsbPortStatus); BatteryTestUtils.setupIncompatibleEvent(mUsbPort, mUsbManager, mUsbPortStatus);
mController.mPreference = new Preference(mContext); mController.mPreference = new Preference(mContext);
BatteryInfo info = new BatteryInfo(); BatteryInfo info = new BatteryInfo();
info.batteryPercentString = "66%";
assertThat(mController.getDashboardLabel(mContext, info, true)) assertThat(mController.getDashboardLabel(mContext, info, true))
.isEqualTo( .isEqualTo(
mContext.getString( mContext.getString(
com.android.settingslib.R.string.battery_info_status_not_charging)); com.android.settingslib.R.string
.power_incompatible_charging_settings_home_page,
info.batteryPercentString));
} }
@Test @Test