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

am e82793a2: am 6132fe1c: am d10026cb: Merge "[Fingerprint] Change message in encryption" into mnc-dev

Browse Source 
* commit 'e82793a2de48be5334f3892d96e1e2736a3064c0':
  [Fingerprint] Change message in encryption
This commit is contained in:
Maurice Lam
2015-07-21 01:04:50 +00:00
committed by Android Git Automerger
parent ec2f7fe57d e82793a2de
commit b8c099519b
5 changed files with 25 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
res/values/strings.xml
View File

@@ -6392,6 +6392,13 @@
\n\nThis helps protect data on lost or stolen devices.
</string>
<!-- Message shown on encryption interstitial to ask the user whether or not they want to use a PIN to encrypt the device while setting up fingerprint unlock. [CHAR LIMIT=NONE] -->
<string name="encryption_interstitial_message_pin_for_fingerprint">In addition to using your fingerprint to unlock your device, you can further protect this device by requiring your PIN before it starts up. Until the device starts up, it can\u2019t receive calls, messages, or notifications, including alarms.\n\nThis helps protect data on lost or stolen devices.</string>
<!-- Message shown on encryption interstitial to ask the user whether or not they want to use a pattern to encrypt the device while setting up fingerprint unlock. [CHAR LIMIT=NONE] -->
<string name="encryption_interstitial_message_pattern_for_fingerprint">In addition to using your fingerprint to unlock your device, you can further protect this device by requiring your pattern before it starts up. Until the device starts up, it can\u2019t receive calls, messages, or notifications, including alarms.\n\nThis helps protect data on lost or stolen devices.</string>
<!-- Message shown on encryption interstitial to ask the user whether or not they want to use a password to encrypt the device while setting up fingerprint unlock. [CHAR LIMIT=NONE] -->
<string name="encryption_interstitial_message_password_for_fingerprint">In addition to using your fingerprint to unlock your device, you can further protect this device by requiring your password before it starts up. Until the device starts up, it can\u2019t receive calls, messages, or notifications, including alarms.\n\nThis helps protect data on lost or stolen devices.</string>
<!-- Radio button text that require a PIN to start device [CHAR LIMIT=NONE] -->
<string name="encrypt_require_pin">Require PIN to start device</string>
<!-- Radio button text that require a pattern to start device [CHAR LIMIT=NONE] -->