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

Commit f63da1e9 authored by Beverly's avatar Beverly Committed by Beverly Tai
Browse files

Update keyguard charging text to indicate wireless 

- Keyguard charging text indicates the device is wirelessly charging

Test: manual
Change-Id: I9cce8ecaf07f8870164d9ef8a569fcf30db69d85
Merged-in: I9cce8ecaf07f8870164d9ef8a569fcf30db69d85
Fixes: 124084552
parent e4a6fc37

packages/SystemUI/res-keyguard/values/strings.xml

+3 −0
Original line number Diff line number Diff line
@@ -64,6 +64,9 @@ 
         charged, say that it is charged. -->

    <string name="keyguard_charged">Charged</string>



    <!-- When the lock screen is showing and the phone plugged in, and the battery is not fully charged, say that it's wirelessly charging. [CHAR LIMIT=50]  -->

    <string name="keyguard_plugged_in_wireless"><xliff:g id="percentage" example="20%">%s</xliff:g> • Wirelessly Charging</string>



    <!-- When the lock screen is showing and the phone plugged in, and the battery

         is not fully charged, say that it's charging.  -->

    <string name="keyguard_plugged_in"><xliff:g id="percentage">%s</xliff:g> • Charging</string>

packages/SystemUI/res/values/strings.xml

+3 −0
Original line number Diff line number Diff line
@@ -955,6 +955,9 @@ 
    <!-- Interruption level: Alarms only.  Optimized for narrow two-line display. [CHAR LIMIT=40] -->

    <string name="interruption_level_alarms_twoline">Alarms\nonly</string>



    <!-- Indication on the keyguard that is shown when the device is wirelessly charging. [CHAR LIMIT=80]-->

    <string name="keyguard_indication_charging_time_wireless"><xliff:g id="percentage" example="20%">%2$s</xliff:g> • Wirelessly Charging (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> until full)</string>



    <!-- Indication on the keyguard that is shown when the device is charging. [CHAR LIMIT=50]-->

    <string name="keyguard_indication_charging_time"><xliff:g id="percentage">%2$s</xliff:g> • Charging (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%s</xliff:g> until full)</string>

packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java

+22 −16
Original line number Diff line number Diff line
@@ -395,6 +395,7 @@ public class KeyguardIndicationController { 
        final boolean hasChargingTime = chargingTimeRemaining > 0;



        int chargingId;

        if (mPowerPluggedInWired) {

            switch (mChargingSpeed) {

                case KeyguardUpdateMonitor.BatteryStatus.CHARGING_FAST:

                    chargingId = hasChargingTime
@@ -412,6 +413,11 @@ public class KeyguardIndicationController { 
                            : R.string.keyguard_plugged_in;

                    break;

            }

        } else {

            chargingId = hasChargingTime

                    ? R.string.keyguard_indication_charging_time_wireless

                    : R.string.keyguard_plugged_in_wireless;

        }



        String percentage = NumberFormat.getPercentInstance()

                .format(mBatteryLevel / 100f);