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

Commit 58d1d659 authored by Lucas Dupin's avatar Lucas Dupin
Browse files

Revert "Show battery percentage on indication field" 

This reverts commit 15ab3693.

Reason for revert: IllegalFormatConversionException

Fixes: 74386188
Change-Id: I61d82dca45a4b0b973c9ea572c63cbbb8125758d
parent e531edd2

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

+3 −3
Original line number Diff line number Diff line
@@ -57,15 +57,15 @@ 


    <!-- 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>

    <string name="keyguard_plugged_in">Charging</string>



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

         is not fully charged, and it's plugged into a fast charger, say that it's charging fast.  -->

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

    <string name="keyguard_plugged_in_charging_fast">Charging rapidly</string>



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

         is not fully charged, and it's plugged into a slow charger, say that it's charging slowly.  -->

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

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



    <!-- When the lock screen is showing and the battery is low, warn user to plug

         in the phone soon. -->

packages/SystemUI/res/values/strings.xml

+6 −6
Original line number Diff line number Diff line
@@ -946,14 +946,14 @@ 
    <!-- 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 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>

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

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



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

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

    <!-- Indication on the keyguard that is shown when the device is charging rapidly. Should match keyguard_plugged_in_charging_fast [CHAR LIMIT=40]-->

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



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

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

    <!-- Indication on the keyguard that is shown when the device is charging slowly. Should match keyguard_plugged_in_charging_slowly [CHAR LIMIT=40]-->

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



    <!-- Related to user switcher --><skip/>

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

+2 −4
Original line number Diff line number Diff line
@@ -411,14 +411,12 @@ public class KeyguardIndicationController { 
                break;

        }



        String percentage = NumberFormat.getPercentInstance()

                .format(mBatteryLevel / 100f);

        if (hasChargingTime) {

            String chargingTimeFormatted = Formatter.formatShortElapsedTimeRoundingUpToMinutes(

                    mContext, chargingTimeRemaining);

            return mContext.getResources().getString(chargingId, chargingTimeFormatted, percentage);

            return mContext.getResources().getString(chargingId, chargingTimeFormatted);

        } else {

            return mContext.getResources().getString(chargingId, percentage);

            return mContext.getResources().getString(chargingId);

        }

    }