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

Commit b8857ae4 authored by Wesley Wang's avatar Wesley Wang Committed by wesleycwwang
Browse files

Make Settings battery entries support dock charging 

Bug: 233033937
Test: make SettingsLibRoboTests
Change-Id: Ib105ceb6c016fc384f0b8c38200d74369e648513
parent b8f5810e

packages/SettingsLib/res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -1134,6 +1134,8 @@ 
    <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>

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

    <string name="battery_info_status_charging_dock">Charging Dock</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. A state which device is connected with any charger(e.g. USB, Adapter or Wireless) but not charging yet. Used for diagnostic info screens, precise translation isn't needed -->

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

+2 −0
Original line number Diff line number Diff line
@@ -239,6 +239,8 @@ public class Utils { 
                            statusString = res.getString(R.string.battery_info_status_charging);

                            break;

                    }

                } else if (batteryStatus.isPluggedInDock()) {

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

                } else {

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

                }

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

+11 −0
Original line number Diff line number Diff line
@@ -364,6 +364,17 @@ public class UtilsTest { 
                resources.getString(R.string.battery_info_status_charging));

    }



    @Test

    public void getBatteryStatus_chargingDock_returnDockChargingString() {

        final Intent intent = new Intent();

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

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

        final Resources resources = mContext.getResources();



        assertThat(Utils.getBatteryStatus(mContext, intent, /* compactStatus= */ false)).isEqualTo(

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

    }



    @Test

    public void getBatteryStatus_chargingWireless_returnWirelessChargingString() {

        final Intent intent = new Intent();