diff options
| author | Jorim Jaggi <jjaggi@google.com> | 2015-05-13 20:32:30 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-13 20:32:31 +0000 |
| commit | 131a19ee6f55d95d747d3d1ed62537b1db5a2e69 (patch) | |
| tree | 163fcc18f15a89eaf9596d92f97559080d54ea31 /core/res | |
| parent | d90bf46264615159e1e16ee69e78a8651e126d6e (diff) | |
| parent | ee77cebc1a54a0bee1a1d538db0abed00aa9cb4e (diff) | |
| download | frameworks_base-131a19ee6f55d95d747d3d1ed62537b1db5a2e69.zip frameworks_base-131a19ee6f55d95d747d3d1ed62537b1db5a2e69.tar.gz frameworks_base-131a19ee6f55d95d747d3d1ed62537b1db5a2e69.tar.bz2 | |
Merge "Persist fingerprint names" into mnc-dev
Diffstat (limited to 'core/res')
| -rw-r--r-- | core/res/res/values/strings.xml | 3 | ||||
| -rwxr-xr-x | core/res/res/values/symbols.xml | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index 47ff16b..bd4d73d 100644 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -1255,6 +1255,9 @@ <!-- Generic error message shown when the fingerprint hardware can't recognize the fingerprint --> <string name="fingerprint_error_unable_to_process">Try again.</string> + <!-- Template to be used to name enrolled fingerprints by default. --> + <string name="fingerprint_name_template">Finger <xliff:g id="fingerId" example="1">%d</xliff:g></string> + <!-- Array containing custom error messages from vendor. Vendor is expected to add and translate these strings --> <string-array name="fingerprint_error_vendor"> </string-array> diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index 1f6e861..8292e23 100755 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -2112,6 +2112,7 @@ <java-symbol type="array" name="fingerprint_acquired_vendor" /> <java-symbol type="string" name="fingerprint_error_canceled" /> <java-symbol type="string" name="fingerprint_error_lockout" /> + <java-symbol type="string" name="fingerprint_name_template" /> <!-- From various Material changes --> <java-symbol type="attr" name="titleTextAppearance" /> |