PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I0839b46ff235b7380dece5d61d1b2078d2060668
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2022-09-02 21:35:22 +00:00
committed by Automerger Merge Worker
parent 1cd2f67db2 8f0b3c2d6a
commit 951292e156
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/values/strings.xml
View File

@@ -1297,7 +1297,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>

2
src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java
View File

@@ -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);