Merge "Updated fingerprint dialog deletion strings." into tm-qpr-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
048bc692a4
@@ -1470,7 +1470,7 @@
|
|||||||
<string name="fingerprint_last_delete_title">Remove all fingerprints?</string>
|
<string name="fingerprint_last_delete_title">Remove all fingerprints?</string>
|
||||||
|
|
||||||
<!-- Title shown in a dialog which asks the user to confirm when a single fingerprint gets deleted. [CHAR LIMIT=50]-->
|
<!-- Title shown in a dialog which asks the user to confirm when a single fingerprint gets deleted. [CHAR LIMIT=50]-->
|
||||||
<string name="fingerprint_delete_title">Remove \'<xliff:g id="fingerprint_id" example="Fingerprint 2">%1$s</xliff:g>\'</string>
|
<string name="fingerprint_delete_title">Delete \'<xliff:g id="fingerprint_id" example="Fingerprint 2">%1$s</xliff:g>\'</string>
|
||||||
|
|
||||||
<!-- Message shown in a dialog which asks the user to confirm when a single fingerprint gets deleted. [CHAR LIMIT=NONE]-->
|
<!-- Message shown in a dialog which asks the user to confirm when a single fingerprint gets deleted. [CHAR LIMIT=NONE]-->
|
||||||
<string name="fingerprint_delete_message">Do you want to delete this fingerprint?</string>
|
<string name="fingerprint_delete_message">Do you want to delete this fingerprint?</string>
|
||||||
|
@@ -1015,7 +1015,7 @@ public class FingerprintSettings extends SubSettings {
|
|||||||
|
|
||||||
final String title = getString(R.string.fingerprint_delete_title, mFp.getName());
|
final String title = getString(R.string.fingerprint_delete_title, mFp.getName());
|
||||||
final String message =
|
final String message =
|
||||||
getString(R.string.fingerprint_v2_delete_message, mFp.getName());
|
getString(R.string.fingerprint_v2_delete_message, mFp.getName()) + ".";
|
||||||
|
|
||||||
DevicePolicyManager devicePolicyManager =
|
DevicePolicyManager devicePolicyManager =
|
||||||
getContext().getSystemService(DevicePolicyManager.class);
|
getContext().getSystemService(DevicePolicyManager.class);
|
||||||
|
Reference in New Issue
Block a user