From 26b46882cbeb852bbe4fcd7a563a199c7c054823 Mon Sep 17 00:00:00 2001
From: Andres Morales <anmorales@google.com>
Date: Wed, 19 Nov 2014 13:55:44 -0800
Subject: [PATCH] Update enable oem unlock warning

updating the strings from bug previously fixed

Bug:18227644
Change-Id: I2b651c807df7585f4d08a26a2a09895100ae2cd6
---
 res/values/strings.xml                            | 10 +++++-----
 src/com/android/settings/DevelopmentSettings.java |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 6950aaf4d18..213d0502833 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -3376,17 +3376,17 @@
     <!-- setting Checkbox summary whether to capture all bluetooth HCI packets in a file -->
     <string name="bt_hci_snoop_log_summary">Capture all bluetooth HCI packets in a file</string>
     <!-- setting Checkbox title whether to enable OEM unlock [CHAR_LIMIT=35] -->
-    <string name="oem_unlock_enable">Enable OEM unlock</string>
+    <string name="oem_unlock_enable">OEM unlocking</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>
+    <string name="oem_unlock_enable_summary">Allow the bootloader to be 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>
+    <string name="confirm_enable_oem_unlock_title">Allow OEM unlocking?</string>
+    <!-- Warning dialog message to confirm user wishes to enable OEM unlock and disable theft protection features -->
+    <string name="confirm_enable_oem_unlock_text">WARNING: Device protection features will not work on this device while this setting is turned on.</string>
 
 
     <!-- Setting Checkbox title whether to show options for wireless display certification -->
diff --git a/src/com/android/settings/DevelopmentSettings.java b/src/com/android/settings/DevelopmentSettings.java
index 4af2baf47d2..dc0a5e1a5ce 100644
--- a/src/com/android/settings/DevelopmentSettings.java
+++ b/src/com/android/settings/DevelopmentSettings.java
@@ -1291,7 +1291,7 @@ public class DevelopmentSettings extends SettingsPreferenceFragment
         new AlertDialog.Builder(getActivity())
                 .setTitle(R.string.confirm_enable_oem_unlock_title)
                 .setMessage(R.string.confirm_enable_oem_unlock_text)
-                .setPositiveButton(R.string.yes, onConfirmListener)
+                .setPositiveButton(R.string.enable_text, onConfirmListener)
                 .setNegativeButton(android.R.string.cancel, null)
                 .create()
                 .show();