summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
Diffstat (limited to 'res')
-rw-r--r--res/menu/storage.xml4
-rw-r--r--res/values/strings.xml20
-rw-r--r--res/xml/development_prefs.xml5
3 files changed, 23 insertions, 6 deletions
diff --git a/res/menu/storage.xml b/res/menu/storage.xml
index fa9639c..2e4c660 100644
--- a/res/menu/storage.xml
+++ b/res/menu/storage.xml
@@ -18,8 +18,4 @@
<item
android:id="@+id/storage_usb"
android:title="@string/storage_menu_usb" />
- <item
- android:id="@+id/storage_enforce_read_external"
- android:title="@string/storage_menu_enforce_read_external"
- android:checkable="true" />
</menu>
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. -->
diff --git a/res/xml/development_prefs.xml b/res/xml/development_prefs.xml
index 9788864..6cb8238 100644
--- a/res/xml/development_prefs.xml
+++ b/res/xml/development_prefs.xml
@@ -39,6 +39,11 @@
android:entries="@array/hdcp_checking_titles"
android:entryValues="@array/hdcp_checking_values" />
+ <CheckBoxPreference
+ android:key="enforce_read_external"
+ android:title="@string/enforce_read_external_title"
+ android:summary="@string/enforce_read_external_summary" />
+
<PreferenceCategory android:key="debug_debugging_category"
android:title="@string/debug_debugging_category">