Enforce READ_EXTERNAL in Developer Options.
Move from Storage to Developer Options, and add interstitial dialog
with more details.
Bug: 6461446
Change-Id: I6d3d8fdc61a3e920ed58ab4d726949ac3c31feab
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 6261fc5..9a1f2cd 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1904,8 +1904,6 @@
<!-- Storage setting. Menu option for USB transfer settings [CHAR LIMIT=30]-->
<string name="storage_menu_usb">USB computer connection</string>
- <!-- Storage setting. Menu option to enforce read external storage permission. [CHAR LIMIT=30]-->
- <string name="storage_menu_enforce_read_external">Enforce read external</string>
<!-- Storage setting. Title for USB transfer settings [CHAR LIMIT=30]-->
<string name="storage_title_usb">USB computer connection</string>
@@ -2806,6 +2804,24 @@
<!-- Warning text to user about the implications of enabling USB debugging -->
<string name="dev_settings_warning_message">These settings are intended for development use only. They can cause your device and the applications on it to break or misbehave.</string>
+ <!-- Title of checkbox setting that protects external storage. [CHAR LIMIT=32] -->
+ <string name="enforce_read_external_title" product="nosdcard">Protect USB storage</string>
+ <!-- Summary of checkbox setting that protects external storage. [CHAR LIMIT=64] -->
+ <string name="enforce_read_external_summary" product="nosdcard">Apps must request permission to read USB storage</string>
+ <!-- Title of dialog confirming that user wants to protect external storage. [CHAR LIMIT=32] -->
+ <string name="enforce_read_external_confirm_title" product="nosdcard">Protect USB storage?</string>
+ <!-- Message of dialog confirming that user wants to protect external storage. [CHAR LIMIT=NONE] -->
+ <string name="enforce_read_external_confirm_message" product="nosdcard">When USB storage is protected, apps must request permission to read data from external storage.\n\nSome apps may not work until updated by their developers.</string>
+
+ <!-- Title of checkbox setting that protects external storage. [CHAR LIMIT=32] -->
+ <string name="enforce_read_external_title" product="default">Protect SD card</string>
+ <!-- Summary of checkbox setting that protects external storage. [CHAR LIMIT=64] -->
+ <string name="enforce_read_external_summary" product="default">Apps must request permission to read SD card</string>
+ <!-- Title of dialog confirming that user wants to protect external storage. [CHAR LIMIT=32] -->
+ <string name="enforce_read_external_confirm_title" product="default">Protect SD card?</string>
+ <!-- Message of dialog confirming that user wants to protect external storage. [CHAR LIMIT=NONE] -->
+ <string name="enforce_read_external_confirm_message" product="default">When SD card is protected, apps must request permission to read data from external storage.\n\nSome apps may not work until updated by their developers.</string>
+
<!-- Title for the screen that lets the user choose a gadget to add to the home screen
(or other screens that can host gadgets). Note to translators: we're still determining
the final name for Gadgets/Widgets, so please translate both for now. -->