diff options
| author | Maurice Lam <yukl@google.com> | 2015-07-21 00:22:34 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-21 00:25:16 +0000 |
| commit | d10026cbfde671448b702fde345da52ac7569d04 (patch) | |
| tree | db4004b8387442acea3dfc9232be3333a5209734 /res | |
| parent | af57ec8831d3047400a6bcbc8c5e73fc3888b7d3 (diff) | |
| parent | c0e7879684d7d9c5cd102b124ee8cf1a2637d49d (diff) | |
| download | packages_apps_Settings-d10026cbfde671448b702fde345da52ac7569d04.zip packages_apps_Settings-d10026cbfde671448b702fde345da52ac7569d04.tar.gz packages_apps_Settings-d10026cbfde671448b702fde345da52ac7569d04.tar.bz2 | |
Merge "[Fingerprint] Change message in encryption" into mnc-dev
Diffstat (limited to 'res')
| -rw-r--r-- | res/values/strings.xml | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index 5f71b08..6fe13cc 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -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] --> |