Merge "Move strings to SettingsLib so TV can use them" into oc-dev
diff --git a/res/values/strings.xml b/res/values/strings.xml
index aad73e8..5a9fe4b 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -3609,8 +3609,6 @@
<!-- Text for filter option in ManageApps screen to display list of
packages installed on sdcard. -->
<string name="filter_apps_onsdcard" product="default">On SD card</string>
- <!-- [CHAR LIMIT=25] Manage applications, text telling using an application is disabled. -->
- <string name="disabled">Disabled</string>
<!-- [CHAR LIMIT=30] Manage applications, text telling using an application is not installed for the current user. The key part is that it's not installed. -->
<string name="not_installed">Not installed for this user</string>
<!-- [CHAR LIMIT=30] App details, text telling an application is installed. -->
@@ -7671,8 +7669,6 @@
<!-- Summary of app not allowed to display over other apps [CHAR LIMIT=60] -->
<string name="system_alert_window_off">No</string>
- <!-- Title for settings screen for controlling apps that can install other apps on device [CHAR LIMIT=50] -->
- <string name="install_other_apps">Install unknown apps</string>
<!-- Keywords for setting screen for controlling apps that can install other apps on device -->
<string name="keywords_install_other_apps">install apps unknown sources</string>
@@ -7702,10 +7698,6 @@
<string name="write_settings_on">Yes</string>
<!-- Summary of app not allowed to write system settings [CHAR LIMIT=45] -->
<string name="write_settings_off">No</string>
- <!-- Summary of app trusted to install apps [CHAR LIMIT=45] -->
- <string name="external_source_trusted">Allowed</string>
- <!-- Summary of app not trusted to install apps [CHAR LIMIT=45] -->
- <string name="external_source_untrusted">Not allowed</string>
<!-- Title of switch preference that controls whether an external app source is trusted or not [CHAR LIMIT=50] -->
<string name="external_source_switch_title">Allow from this source</string>