Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a8fa24cc authored by YK Hung's avatar YK Hung Committed by Android (Google) Code Review
Browse files

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

parents 3c71a5ff fe96aee9

src/com/android/settings/fuelgauge/TopLevelBatteryPreferenceController.java

+2 −1
Original line number Diff line number Diff line
@@ -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(

tests/robotests/src/com/android/settings/fuelgauge/TopLevelBatteryPreferenceControllerTest.java

+4 −1
Original line number Diff line number Diff line
@@ -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