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

Commit 08071679 authored by Caitlin Shkuratov's avatar Caitlin Shkuratov Committed by Automerger Merge Worker
Browse files

Merge changes Ifaf76304,Ia2404d43 into tm-qpr-dev am: 1f801dcc am: fad4ee3c 

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



Change-Id: Id79533cdf567fdc0f80bb107d649c65ecd6030a8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f349e41a fad4ee3c

packages/SystemUI/res/values/strings.xml

+3 −3
Original line number Diff line number Diff line
@@ -439,16 +439,16 @@ 
    <string name="accessibility_battery_level">Battery <xliff:g id="number">%d</xliff:g> percent.</string>



    <!-- Content description of the battery level icon for accessibility, including the estimated time remaining before the phone runs out of battery (not shown on the screen). [CHAR LIMIT=NONE] -->

    <string name="accessibility_battery_level_with_estimate">Battery <xliff:g id="percentage" example="95%">%1$d</xliff:g> percent, about <xliff:g id="time" example="Until 3:15pm">%2$s</xliff:g> left based on your usage</string>

    <string name="accessibility_battery_level_with_estimate">Battery <xliff:g id="percentage" example="95%">%1$d</xliff:g> percent, <xliff:g id="time" example="Until 3:15pm">%2$s</xliff:g></string>



    <!-- Content description of the battery level icon for accessibility while the device is charging (not shown on the screen). [CHAR LIMIT=NONE] -->

    <string name="accessibility_battery_level_charging">Battery charging, <xliff:g id="battery_percentage">%d</xliff:g> percent.</string>



    <!-- Content description of the battery level icon for accessibility, with information that the device charging is paused in order to protect the lifetime of the battery (not shown on screen). [CHAR LIMIT=NONE] -->

    <string name="accessibility_battery_level_charging_paused">Battery <xliff:g id="percentage" example="90%">%d</xliff:g> percent. Charging paused for battery protection.</string>

    <string name="accessibility_battery_level_charging_paused">Battery <xliff:g id="percentage" example="90%">%d</xliff:g> percent, charging paused for battery protection.</string>



    <!-- Content description of the battery level icon for accessibility, including the estimated time remaining before the phone runs out of battery *and* information that the device charging is paused in order to protect the lifetime of the battery (not shown on screen). [CHAR LIMIT=NONE] -->

    <string name="accessibility_battery_level_charging_paused_with_estimate">Battery <xliff:g id="percentage" example="90%">%1$d</xliff:g> percent, about <xliff:g id="time" example="Until 3:15pm">%2$s</xliff:g> left based on your usage. Charging paused for battery protection.</string>

    <string name="accessibility_battery_level_charging_paused_with_estimate">Battery <xliff:g id="percentage" example="90%">%1$d</xliff:g> percent, <xliff:g id="time" example="Until 3:15pm">%2$s</xliff:g>, charging paused for battery protection.</string>



    <!-- Content description of overflow icon container of the notifications for accessibility (not shown on the screen)[CHAR LIMIT=NONE] -->

    <string name="accessibility_overflow_action">See all notifications</string>

packages/SystemUI/src/com/android/systemui/statusbar/policy/BatteryControllerImpl.java

+1 −0
Original line number Diff line number Diff line
@@ -156,6 +156,7 @@ public class BatteryControllerImpl extends BroadcastReceiver implements BatteryC 
        pw.print("  mPluggedIn="); pw.println(mPluggedIn);

        pw.print("  mCharging="); pw.println(mCharging);

        pw.print("  mCharged="); pw.println(mCharged);

        pw.print("  mIsOverheated="); pw.println(mIsOverheated);

        pw.print("  mPowerSave="); pw.println(mPowerSave);

        pw.print("  mStateUnknown="); pw.println(mStateUnknown);

    }