Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge change 6246 into donut

Browse Source 
* changes:
  Fix bugs 1317754 - "Idle screen displays "Charging (100%)" even when fully charged." and 1885870 - "Shorten 'Clear notification' button to 'Clear' to match latest design"
This commit is contained in:
Android (Google) Code Review
2009-07-06 12:09:34 -07:00
parent 0d725f7d5a c83edf47f4
commit 6eb987aca7
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/res/res/values/strings.xml
View File

@@ -1195,6 +1195,7 @@
<!-- When the lock screen is showing and the phone plugged in, show the current <!-- When the lock screen is showing and the phone plugged in, show the current
charge %. --> charge %. -->
<string name="lockscreen_plugged_in">Charging (<xliff:g id="number">%d</xliff:g><xliff:g id="percent">%%</xliff:g>)</string> <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 <!-- When the lock screen is showing and the battery is low, warn user to plug
in the phone soon. --> in the phone soon. -->
@@ -1271,7 +1272,7 @@
<!-- The text for the button in the notification window-shade that clears <!-- The text for the button in the notification window-shade that clears
all of the currently visible notifications. --> 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 <!-- The label in the bar at the top of the status bar when there are no notifications
showing. --> showing. -->