diff --git a/src/com/android/settings/fuelgauge/TopLevelBatteryPreferenceController.java b/src/com/android/settings/fuelgauge/TopLevelBatteryPreferenceController.java index 365a2cacb89..08d49f1a632 100644 --- a/src/com/android/settings/fuelgauge/TopLevelBatteryPreferenceController.java +++ b/src/com/android/settings/fuelgauge/TopLevelBatteryPreferenceController.java @@ -151,7 +151,8 @@ public class TopLevelBatteryPreferenceController extends BasePreferenceControlle private CharSequence generateLabel(BatteryInfo info) { if (Utils.containsIncompatibleChargers(mContext, TAG)) { 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)) { return mContext.getString( diff --git a/tests/robotests/src/com/android/settings/fuelgauge/TopLevelBatteryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/TopLevelBatteryPreferenceControllerTest.java index 3435987beba..f7b5049cda9 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/TopLevelBatteryPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/TopLevelBatteryPreferenceControllerTest.java @@ -130,11 +130,14 @@ public class TopLevelBatteryPreferenceControllerTest { BatteryTestUtils.setupIncompatibleEvent(mUsbPort, mUsbManager, mUsbPortStatus); mController.mPreference = new Preference(mContext); BatteryInfo info = new BatteryInfo(); + info.batteryPercentString = "66%"; assertThat(mController.getDashboardLabel(mContext, info, true)) .isEqualTo( 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