diff options
| author | Adrian Roos <roosa@google.com> | 2015-07-14 19:17:00 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-14 19:17:07 +0000 |
| commit | 9c013a211768c661f1142aba31c690daa76c66f7 (patch) | |
| tree | 61950f73f1d16cd47065408025fa2afbd16bb66c /packages/Keyguard/res | |
| parent | d72fc63aae69a7dbff4287dd56cc20d3f617277e (diff) | |
| parent | 7b04311d88e377c67b4c663091b6b1c63c932c52 (diff) | |
| download | frameworks_base-9c013a211768c661f1142aba31c690daa76c66f7.zip frameworks_base-9c013a211768c661f1142aba31c690daa76c66f7.tar.gz frameworks_base-9c013a211768c661f1142aba31c690daa76c66f7.tar.bz2 | |
Merge "Show charging speed on Keyguard" into mnc-dr-dev
Diffstat (limited to 'packages/Keyguard/res')
| -rw-r--r-- | packages/Keyguard/res/values/config.xml | 6 | ||||
| -rw-r--r-- | packages/Keyguard/res/values/strings.xml | 8 |
2 files changed, 14 insertions, 0 deletions
diff --git a/packages/Keyguard/res/values/config.xml b/packages/Keyguard/res/values/config.xml index 8d9d6ee..b398ab2 100644 --- a/packages/Keyguard/res/values/config.xml +++ b/packages/Keyguard/res/values/config.xml @@ -22,4 +22,10 @@ <!-- Allow the menu hard key to be disabled in LockScreen on some devices [DO NOT TRANSLATE] --> <bool name="config_disableMenuKeyInLockScreen">false</bool> + + <!-- Threshold in micro amperes below which a charger is rated as "slow" --> + <integer name="config_chargingSlowlyThreshold">1000000</integer> + + <!-- Threshold in micro amperes above which a charger is rated as "fast" --> + <integer name="config_chargingFastThreshold">1500000</integer> </resources> diff --git a/packages/Keyguard/res/values/strings.xml b/packages/Keyguard/res/values/strings.xml index 748129c..14c8a2c 100644 --- a/packages/Keyguard/res/values/strings.xml +++ b/packages/Keyguard/res/values/strings.xml @@ -56,6 +56,14 @@ is not fully charged, say that it's charging. --> <string name="keyguard_plugged_in">Charging</string> + <!-- When the lock screen is showing and the phone plugged in, and the battery + is not fully charged, and it's plugged into a fast charger, say that it's charging fast. --> + <string name="keyguard_plugged_in_charging_fast">Charging rapidly</string> + + <!-- When the lock screen is showing and the phone plugged in, and the battery + is not fully charged, and it's plugged into a slow charger, say that it's charging slowly. --> + <string name="keyguard_plugged_in_charging_slowly">Charging slowly</string> + <!-- When the lock screen is showing and the battery is low, warn user to plug in the phone soon. --> <string name="keyguard_low_battery">Connect your charger.</string> |