diff options
| author | Adrian Roos <roosa@google.com> | 2014-06-04 20:52:14 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-04 20:52:14 +0000 |
| commit | ee920d50077e9d5193ae28ab2b3b700b800e8336 (patch) | |
| tree | 2075d4cd152cef6417b7fc4ba0ab4ba5a5e3d37c /packages/Keyguard | |
| parent | 67985dd51e9d05ee4281735d358d18179def23b2 (diff) | |
| parent | 3b60d3fe9d2490dd5b7d7d9f65377f37134993ae (diff) | |
| download | frameworks_base-ee920d50077e9d5193ae28ab2b3b700b800e8336.zip frameworks_base-ee920d50077e9d5193ae28ab2b3b700b800e8336.tar.gz frameworks_base-ee920d50077e9d5193ae28ab2b3b700b800e8336.tar.bz2 | |
am 612734fb: Merge "Display time to charge on lock screen" into lmp-preview-dev
* commit '612734fbfa24b925d51dcf47260a87290629f220':
Display time to charge on lock screen
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; |