summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Christine Franks <christyfranks@google.com> 2017-01-23 17:19:13 -0800
committer Christine Franks <christyfranks@google.com> 2017-01-25 17:14:07 +0000
commitcf683142cf77a7e0fa292f1f4e4801a0dec4f08f (patch)
treef1d81ebb34ae7e4d44dd0fb5d9bb963122f38e06
parent4bd54c70fa37909fdd7c764d9995c132e7cc137d (diff)
Merge "Require password to FR in carrier demo mode"
Bug: 34341567 Test: manual - still builds Change-Id: Ie450a97db5c3ce58a1a5e43334bb0546a3c48645
-rw-r--r--packages/SettingsLib/res/values/strings.xml7
1 files changed, 7 insertions, 0 deletions
diff --git a/packages/SettingsLib/res/values/strings.xml b/packages/SettingsLib/res/values/strings.xml
index a1b2bdf5662f..01296327f689 100644
--- a/packages/SettingsLib/res/values/strings.xml
+++ b/packages/SettingsLib/res/values/strings.xml
@@ -893,4 +893,11 @@
<!-- Label for Greenwich mean time, used in a string like GMT+05:00. [CHAR LIMIT=NONE] -->
<string name="time_zone_gmt">GMT</string>
+
+ <!-- Label for carrier demo mode factory reset confirmation dialog. [CHAR LIMIT=NONE] -->
+ <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>