diff options
author | Jim Miller <jaggies@google.com> | 2013-09-25 15:44:15 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-09-25 15:44:15 -0700 |
commit | 4bf2c790b971cf43c65d8e9e5721a2a9dde474b5 (patch) | |
tree | 55616dfa5766959d76ab98dcd9bac716bcda557b /packages/Keyguard/res | |
parent | b4d4d68795a10401e3cb50df491a2e5d5b1ac96e (diff) | |
parent | 04b0840b2e5367547fdd92f4e2c68cde16486062 (diff) | |
download | frameworks_base-4bf2c790b971cf43c65d8e9e5721a2a9dde474b5.zip frameworks_base-4bf2c790b971cf43c65d8e9e5721a2a9dde474b5.tar.gz frameworks_base-4bf2c790b971cf43c65d8e9e5721a2a9dde474b5.tar.bz2 |
am 04b0840b: Merge "Accessibility improvements in keyguard - add accessibility descriptions to camera and search light - add new onClick handler to simplify launching search and camera - plumb camera launch through KeyguardService interface" into klp-dev
* commit '04b0840b2e5367547fdd92f4e2c68cde16486062':
Accessibility improvements in keyguard - add accessibility descriptions to camera and search light - add new onClick handler to simplify launching search and camera - plumb camera launch through KeyguardService interface
Diffstat (limited to 'packages/Keyguard/res')
-rw-r--r-- | packages/Keyguard/res/values/strings.xml | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/packages/Keyguard/res/values/strings.xml b/packages/Keyguard/res/values/strings.xml index 5cf05f8..ba6685a 100644 --- a/packages/Keyguard/res/values/strings.xml +++ b/packages/Keyguard/res/values/strings.xml @@ -149,6 +149,14 @@ <!-- Shown on transport control of lockscreen. Pressing button pauses playback --> <string name="keyguard_accessibility_transport_stop_description">Stop button</string> + <!-- Accessibility description for when the device prompts the user to dismiss keyguard + in order to complete an action. This will be followed by a message about the current + security option (e.g. "Pattern unlock."). [CHAR LIMIT=NONE] --> + <string name="keyguard_accessibility_show_bouncer">Unlock to continue</string> + + <!-- Accessibility description for when the bouncer prompt is dismissed. [CHAR LIMIT=NONE] --> + <string name="keyguard_accessibility_hide_bouncer">Launch canceled</string> + <!-- Password keyboard strings. Used by LockScreen and Settings --><skip /> <!-- Label for "switch to symbols" key. Must be short to fit on key! --> <string name="password_keyboard_label_symbol_key">\?123</string> |