Merge changes I326a4cf2,I1cfce513 into lmp-mr1-dev

* changes:
  Confirm enabling OEM unlock with warning dialog
  Request PIN confirmation to enable OEM unlock
This commit is contained in:
Andres Morales
2014-11-05 16:31:54 +00:00
committed by Android (Google) Code Review
2 changed files with 52 additions and 1 deletions

View File

@@ -3396,6 +3396,15 @@
<string name="oem_unlock_enable">Enable OEM unlock</string>
<!-- setting Checkbox summary whether to enable OEM unlock [CHAR_LIMIT=50] -->
<string name="oem_unlock_enable_summary">Allow the device to be OEM unlocked</string>
<!-- Message to enter device PIN to enable OEM unlock -->
<string name="oem_unlock_enable_pin_prompt">Enter your PIN</string>
<!-- Explanation to enter device pin to enable OEM unlock -->
<string name="oem_unlock_enable_pin_description">Enter your device PIN to enable OEM unlock</string>
<!-- Confirmation dialog title to ensure user wishes to enable OEM unlock and disable theft protection features -->
<string name="confirm_enable_oem_unlock_title">Warning</string>
<!-- Confirmation dialog message to ensure user wishes to enable OEM unlock and disable theft protection features -->
<string name="confirm_enable_oem_unlock_text">Enabling OEM unlock disables theft protection features on this device and may void your warranty. Continue?</string>
<!-- Setting Checkbox title whether to show options for wireless display certification -->
<string name="wifi_display_certification">Wireless display certification</string>