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

Commit 03f8cef1 authored by Android (Google) Code Review's avatar Android (Google) Code Review Committed by The Android Open Source Project
Browse files

am 6eb987ac: Merge change 6246 into donut 

Merge commit '6eb987ac'

* commit '6eb987ac':
  Fix bugs 1317754 - "Idle screen displays "Charging (100%)" even when fully charged."
parents 48c30647 6eb987ac

core/res/res/values/strings.xml

+2 −1
Original line number Diff line number Diff line
@@ -1199,6 +1199,7 @@ 
    <!-- When the lock screen is showing and the phone plugged in, show the current

         charge %.  -->

    <string name="lockscreen_plugged_in">Charging (<xliff:g id="number">%d</xliff:g><xliff:g id="percent">%%</xliff:g>)</string>

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



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

         in the phone soon. -->
@@ -1275,7 +1276,7 @@ 


    <!-- The text for the button in the notification window-shade that clears

         all of the currently visible notifications. -->

    <string name="status_bar_clear_all_button">Clear notifications</string>

    <string name="status_bar_clear_all_button">Clear</string>



    <!-- The label in the bar at the top of the status bar when there are no notifications

         showing. -->