diff options
| author | Adrian Roos <roosa@google.com> | 2014-06-04 13:54:08 +0200 |
|---|---|---|
| committer | Adrian Roos <roosa@google.com> | 2014-06-04 17:15:40 +0200 |
| commit | 12c1ef57d0758b4fc3514c164897390d83edc463 (patch) | |
| tree | ff6c77d9d10b5e255a35df89fda2f27ecc964403 /packages/Keyguard | |
| parent | 8988dbb6dff983c986aa0cc1c05b4aaf8c730bbf (diff) | |
| download | frameworks_base-12c1ef57d0758b4fc3514c164897390d83edc463.zip frameworks_base-12c1ef57d0758b4fc3514c164897390d83edc463.tar.gz frameworks_base-12c1ef57d0758b4fc3514c164897390d83edc463.tar.bz2 | |
Display time to charge on lock screen
Bug: 14410848
Change-Id: I7ffad4dcc83ceeaeb29342439de11c91b4d63ce8
Diffstat (limited to 'packages/Keyguard')
| -rw-r--r-- | packages/Keyguard/res/values/strings.xml | 4 | ||||
| -rw-r--r-- | packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/packages/Keyguard/res/values/strings.xml b/packages/Keyguard/res/values/strings.xml index 8cf07fa..55d8d81 100644 --- a/packages/Keyguard/res/values/strings.xml +++ b/packages/Keyguard/res/values/strings.xml @@ -59,8 +59,8 @@ <string name="keyguard_charged">Charged</string> <!-- When the lock screen is showing and the phone plugged in, and the battery - is not fully charged, show the current charge %. --> - <string name="keyguard_plugged_in">Charging, <xliff:g id="number">%d</xliff:g><xliff:g id="percent">%%</xliff:g></string> + is not fully charged, say that it's charging. --> + <string name="keyguard_plugged_in">Charging</string> <!-- When the lock screen is showing and the battery is low, warn user to plug in the phone soon. --> diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java b/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java index fef971c..668e1ef 100644 --- a/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java +++ b/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java @@ -418,7 +418,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener { } } - /* package */ static class BatteryStatus { + public static class BatteryStatus { public final int status; public final int level; public final int plugged; |