summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorJim Miller <jaggies@google.com>2015-09-09 23:08:06 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-09-09 23:08:06 +0000
commit93b39ff9bd40df755967a4dfe0593b30b0cfa8d2 (patch)
tree7abb732ee784bf8f9bf91ebf62a91287b4c71ae3 /res
parent5fc624418c11d8a949c6ab61fa3c0b0bc2fb2d46 (diff)
parent01f44efab0673e8648470c8be1670730660a4778 (diff)
downloadpackages_apps_Settings-93b39ff9bd40df755967a4dfe0593b30b0cfa8d2.zip
packages_apps_Settings-93b39ff9bd40df755967a4dfe0593b30b0cfa8d2.tar.gz
packages_apps_Settings-93b39ff9bd40df755967a4dfe0593b30b0cfa8d2.tar.bz2
am 01f44efa: am 179fa507: Merge "Handle fp enrollment errors more gracefully - When finger can\'t be analyzed for enrollment (FINGERPRINT_ERROR_UNABLE_TO_PROCESS), tell the user to try again or use a different finger. - When timeout is reached (FINGERPRINT_ERROR_TIMEO
* commit '01f44efab0673e8648470c8be1670730660a4778': Handle fp enrollment errors more gracefully - When finger can't be analyzed for enrollment (FINGERPRINT_ERROR_UNABLE_TO_PROCESS), tell the user to try again or use a different finger. - When timeout is reached (FINGERPRINT_ERROR_TIMEOUT), stop enrollment and ask the user to try again.
Diffstat (limited to 'res')
-rw-r--r--res/values/strings.xml6
1 files changed, 6 insertions, 0 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml
index a808dfe..e88db06 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -772,6 +772,12 @@
<string name="security_settings_fingerprint_enroll_touch_dialog_title">Whoops, that\u2019s not the sensor</string>
<!-- Dialog message for dialog which shows when user touches the icon on the screen, instead of the sensor at the back [CHAR LIMIT=45] -->
<string name="security_settings_fingerprint_enroll_touch_dialog_message">Use the fingerprint sensor on your device.</string>
+ <!-- Dialog message for dialog which shows when finger cannot be enrolled. [CHAR LIMIT=45] -->
+ <string name="security_settings_fingerprint_enroll_error_dialog_title">Enrollment was not completed</string>
+ <!-- Dialog message for dialog which shows when finger cannot be enrolled due to being idle too long. -->
+ <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message">Fingerprint enrollment time limit reached. Try again.</string>
+ <!-- Dialog message for dialog which shows when finger cannot be enrolled due to an internal error or fingerprint can't be read. -->
+ <string name="security_settings_fingerprint_enroll_error_generic_dialog_message">Fingerprint enrollment didn\'t work. Try again or use a different finger.</string>
<!-- Button text shown at the end of enrollment that allows the user to add another fingerprint -->
<string name="fingerprint_enroll_button_add">Add another</string>
<!-- Button text shown at the end of enrollment that allows the user to move to the next step -->