Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "DO NOT MERGE - Require password to FR in carrier demo mode" into nyc-mr2-dev

Browse Source
This commit is contained in:
Christine Franks
2017-01-21 05:36:08 +00:00
committed by Android (Google) Code Review
parent f2a54b6a39 319b44e6e9
commit e1a7e67dc0
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/SettingsLib/res/values/strings.xml
View File

@@ -863,4 +863,10 @@
<!-- Content description for drawer menu button [CHAR_LIMIT=30]--> <!-- Content description for drawer menu button [CHAR_LIMIT=30]-->
<string name="content_description_menu_button">Menu</string> <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> </resources>