Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8f0b3c2d authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Updated fingerprint dialog deletion strings." into tm-qpr-dev am: 048bc692 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19774526



Change-Id: I0d86d362802950e46346718a02dc150fbfb59eb6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 06e92f5e 048bc692

res/values/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -1472,7 +1472,7 @@ 
    <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]-->









    <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]-->









    <string name="fingerprint_delete_message">Do you want to delete this fingerprint?</string>

























src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java



+1
−1






























Original line number
Diff line number
Diff line







@@ -1015,7 +1015,7 @@ public class FingerprintSettings extends SubSettings {

















                final String title = getString(R.string.fingerprint_delete_title, mFp.getName());









                final String message =









                        getString(R.string.fingerprint_v2_delete_message, mFp.getName());









                        getString(R.string.fingerprint_v2_delete_message, mFp.getName()) + ".";



















                DevicePolicyManager devicePolicyManager =









                        getContext().getSystemService(DevicePolicyManager.class);