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

Commit b8007462 authored by Wesley Wang's avatar Wesley Wang Committed by Automerger Merge Worker
Browse files

Merge "Support wireless charge state" into sc-dev am: 4c15ae91 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14127305

Change-Id: If9b4c143120df62cb009c5c637da515ea2df1fee
parents d6cc9b5a 4c15ae91

packages/SettingsLib/res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -1140,6 +1140,8 @@ 
    <string name="battery_info_status_charging_fast">Charging rapidly</string>

    <!-- [CHAR_LIMIT=20] Battery use screen.  Battery status shown in chart label when charging speed is slow.  -->

    <string name="battery_info_status_charging_slow">Charging slowly</string>

    <!-- [CHAR_LIMIT=20] Battery use screen.  Battery status shown in chart label when charging wirelessly.  -->

    <string name="battery_info_status_charging_wireless">Charging wirelessly</string>

    <!-- Battery Info screen. Value for a status item.  Used for diagnostic info screens, precise translation isn't needed -->

    <string name="battery_info_status_discharging">Not charging</string>

    <!-- Battery Info screen. Value for a status item.  Used for diagnostic info screens, precise translation isn't needed -->

packages/SettingsLib/src/com/android/settingslib/Utils.java

+16 −11
Original line number Diff line number Diff line
@@ -204,18 +204,23 @@ public class Utils { 
            statusString = res.getString(R.string.battery_info_status_full);

        } else {

            if (status == BatteryManager.BATTERY_STATUS_CHARGING) {

                if (batteryStatus.isPluggedInWired()) {

                    switch (batteryStatus.getChargingSpeed(context)) {

                        case BatteryStatus.CHARGING_FAST:

                        statusString = res.getString(R.string.battery_info_status_charging_fast);

                            statusString = res.getString(

                                    R.string.battery_info_status_charging_fast);

                            break;

                        case BatteryStatus.CHARGING_SLOWLY:

                        statusString = res.getString(R.string.battery_info_status_charging_slow);

                            statusString = res.getString(

                                    R.string.battery_info_status_charging_slow);

                            break;

                        default:

                            statusString = res.getString(R.string.battery_info_status_charging);

                            break;

                    }



                } else {

                    statusString = res.getString(R.string.battery_info_status_charging_wireless);

                }

            } else if (status == BatteryManager.BATTERY_STATUS_DISCHARGING) {

                statusString = res.getString(R.string.battery_info_status_discharging);

            } else if (status == BatteryManager.BATTERY_STATUS_NOT_CHARGING) {

packages/SettingsLib/tests/robotests/src/com/android/settingslib/UtilsTest.java

+14 −2
Original line number Diff line number Diff line
@@ -336,11 +336,23 @@ public class UtilsTest { 


    @Test

    public void getBatteryStatus_batteryLevel99_returnChargingString() {

        final Intent intent = new Intent().putExtra(BatteryManager.EXTRA_STATUS,

                BatteryManager.BATTERY_STATUS_CHARGING);

        final Intent intent = new Intent();

        intent.putExtra(BatteryManager.EXTRA_STATUS, BatteryManager.BATTERY_STATUS_CHARGING);

        intent.putExtra(BatteryManager.EXTRA_PLUGGED, BatteryManager.BATTERY_PLUGGED_USB);

        final Resources resources = mContext.getResources();



        assertThat(Utils.getBatteryStatus(mContext, intent)).isEqualTo(

                resources.getString(R.string.battery_info_status_charging));

    }



    @Test

    public void getBatteryStatus_chargingWireless_returnWirelessChargingString() {

        final Intent intent = new Intent();

        intent.putExtra(BatteryManager.EXTRA_STATUS, BatteryManager.BATTERY_STATUS_CHARGING);

        intent.putExtra(BatteryManager.EXTRA_PLUGGED, BatteryManager.BATTERY_PLUGGED_WIRELESS);

        final Resources resources = mContext.getResources();



        assertThat(Utils.getBatteryStatus(mContext, intent)).isEqualTo(

                resources.getString(R.string.battery_info_status_charging_wireless));

    }

}