From 319b44e6e95a977f37534672d8906ae392dd23d3 Mon Sep 17 00:00:00 2001
From: Christine Franks <christyfranks@google.com>
Date: Fri, 20 Jan 2017 11:56:32 -0800
Subject: [PATCH] DO NOT MERGE - Require password to FR in carrier demo mode

Bug: 34341567
Test: manual - password not required for regular user factory resets
and is required in carrier demo mode.

Change-Id: If696e5c5c806e31399e33a151b0d36e7a950ceb0
---
 packages/SettingsLib/res/values/strings.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/packages/SettingsLib/res/values/strings.xml b/packages/SettingsLib/res/values/strings.xml
index 43b766803e333..072fe687d749d 100644
--- a/packages/SettingsLib/res/values/strings.xml
+++ b/packages/SettingsLib/res/values/strings.xml
@@ -863,4 +863,10 @@
     <!-- Content description for drawer menu button [CHAR_LIMIT=30]-->
     <string name="content_description_menu_button">Menu</string>
 
+    <!-- Label for carrier demo mode factory reset confirmation dialog. [CHAR LIMIT=40] -->
+    <string name="retail_demo_reset_message">Enter password to perform factory reset in demo mode</string>
+    <!-- Label for positive button on carrier demo  mode factory reset confirmation dialog [CHAR LIMIT=40] -->
+    <string name="retail_demo_reset_next">Next</string>
+    <!-- Title for carrier demo mode factory reset confirmation dialog. [CHAR LIMIT=40] -->
+    <string name="retail_demo_reset_title">Password required</string>
 </resources>