Merge "Fixes a string for tablets/devices" into nyc-dev am: e0892e1 am: be21812

am: 8e9323b840

* commit '8e9323b840b47b31ce294584789929191a578a35':
  Fixes a string for tablets/devices

Change-Id: Ifc93fc2f12ac5e0e937d7bf23196db292a767e9c
This commit is contained in:
Udam Saini
2016-04-21 03:27:07 +00:00
committed by android-build-merger

View File

@@ -981,8 +981,12 @@
<!-- Title for security picker to choose the profile unlock method: None/Pattern/PIN/Password [CHAR LIMIT=22] -->
<string name="lock_settings_picker_title_profile">Choose work lock</string>
<!-- Title for security picker in setup wizard to choose the unlock method: None/Pattern/PIN/Password [CHAR LIMIT=22] -->
<string name="setup_lock_settings_picker_title">Protect your phone</string>
<!-- Title for security picker in setup wizard to choose the unlock method: None/Pattern/PIN/Password (tablet) [CHAR LIMIT=22] -->
<string name="setup_lock_settings_picker_title" product="tablet">Protect your tablet</string>
<!-- Title for security picker in setup wizard to choose the unlock method: None/Pattern/PIN/Password (device) [CHAR LIMIT=22] -->
<string name="setup_lock_settings_picker_title" product="device">Protect your device</string>
<!-- Title for security picker in setup wizard to choose the unlock method: None/Pattern/PIN/Password (phone) [CHAR LIMIT=22] -->
<string name="setup_lock_settings_picker_title" product="default">Protect your phone</string>
<!-- Title for screen in setup wizard, prompting user to choose the their backup screen lock method [CHAR LIMIT=NONE] -->
<string name="setup_lock_settings_picker_fingerprint_message">Your fingerprint may be less secure than a strong pattern, PIN, or password. For added security, set up a backup screen lock.</string>