Cleanup cm_arrays

* Remove unused resources
* Set untranslatables
* Convert remaining arrays to string references

Change-Id: I8ae61eb81e0148e8b6954ebc46960348bf35044c

2 files changed, 50 insertions, 59 deletions

diff --git a/res/values/cm_arrays.xml b/res/values/cm_arrays.xml
index c1aa849..c439175 100644
--- a/res/values/cm_arrays.xml
+++ b/res/values/cm_arrays.xml
@@ -30,20 +30,6 @@
         <item>3</item>
     </string-array>
 
-    <!-- Profile mode options. -->
-    <string-array name="profile_entries">
-        <item>On</item>
-        <item>Off</item>
-        <item>No override</item>
-    </string-array>
-
-    <!-- Values for vibrate_entries matching constants in SoundSettings. Do not translate. -->
-    <string-array name="profile_values" translatable="false">
-        <item>OVERRIDE</item>
-        <item>SUPPRESS</item>
-        <item>DEFAULT</item>
-    </string-array>
-
     <!-- Profile lock mode summaries. Do not translate. -->
     <string-array name="profile_lockmode_entries" translatable="false">
         <item>@string/profile_action_system</item>
@@ -98,18 +84,12 @@
         <item>2</item>
     </string-array>
 
-    <string-array name="profile_action_generic_connection_entries">
+    <string-array name="profile_action_generic_connection_entries" translatable="false">
         <item>@string/profile_action_none</item>
         <item>@string/profile_action_disable</item>
         <item>@string/profile_action_enable</item>
     </string-array>
 
-    <string-array name="profile_action_generic_connection_values">
-        <item>-1</item>
-        <item>0</item>
-        <item>1</item>
-    </string-array>
-
     <string-array name="profile_doze_entries" translatable="false">
         <item>@string/profile_action_none</item>
         <item>@string/profile_action_enable</item>
@@ -123,23 +103,17 @@
     </string-array>
 
     <!-- Profile mode options. -->
-     <string-array name="profile_entries" translatable="false">
-         <item>@string/profile_entries_on</item>
-         <item>@string/profile_entries_off</item>
-         <item>@string/profile_entries_no_override</item>
-     </string-array>
-
-     <!-- Values for vibrate_entries matching constants in SoundSettings. Do not translate. -->
-     <string-array name="profile_values" translatable="false">
-         <item>OVERRIDE</item>
-         <item>SUPPRESS</item>
-         <item>DEFAULT</item>
-     </string-array>
+    <string-array name="profile_entries" translatable="false">
+        <item>@string/profile_entries_on</item>
+        <item>@string/profile_entries_off</item>
+        <item>@string/profile_entries_no_override</item>
+    </string-array>
 
-    <string-array name="trigger_page_title">
-        <item>WiFi</item>
-        <item>Bluetooth</item>
-        <item>NFC</item>
+    <!-- Values for vibrate_entries matching constants in SoundSettings. Do not translate. -->
+    <string-array name="profile_values" translatable="false">
+        <item>OVERRIDE</item>
+        <item>SUPPRESS</item>
+        <item>DEFAULT</item>
     </string-array>
 
     <!-- Values for the notification light pulse spinners -->
@@ -348,7 +322,7 @@
     </string-array>
 
     <!-- App ops permissions -->
-    <string-array name="app_ops_permissions">
+    <string-array name="app_ops_permissions" translatable="false">
         <item>@string/app_ops_permissions_allowed</item>
         <item>@string/app_ops_permissions_ignored</item>
         <item>@string/app_ops_permissions_always_ask</item>
@@ -377,10 +351,10 @@
     </string-array>
 
     <!-- Values for screen color  -->
-    <string-array name="screen_color_setting">
-        <item>Standard</item>
-        <item>Vivid</item>
-        <item>Custom</item>
+    <string-array name="screen_color_setting" translatable="false">
+        <item>@string/screen_color_standard</item>
+        <item>@string/screen_color_vivid</item>
+        <item>@string/screen_color_custom</item>
     </string-array>
 
     <!-- Stylus Gestures -->
@@ -528,19 +502,19 @@
     </string-array>
 
     <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi region code. -->
-    <string-array name="wifi_countrycode_entries">
-        <item>United States</item>
-        <item>Canada, Taiwan</item>
-        <item>Germany</item>
-        <item>Europe</item>
-        <item>Japan, Russia</item>
-        <item>Australia</item>
-        <item>China</item>
-        <item>Korea</item>
-        <item>South Africa, Turkey</item>
-        <item>Israel, Singapore</item>
-        <item>Brazil</item>
-        <item>India</item>
+    <string-array name="wifi_countrycode_entries" translatable="false">
+        <item>@string/wifi_countrycode_us</item>
+        <item>@string/wifi_countrycode_ca</item>
+        <item>@string/wifi_countrycode_de</item>
+        <item>@string/wifi_countrycode_gb</item>
+        <item>@string/wifi_countrycode_jp</item>
+        <item>@string/wifi_countrycode_au</item>
+        <item>@string/wifi_countrycode_cn</item>
+        <item>@string/wifi_countrycode_kr</item>
+        <item>@string/wifi_countrycode_tr</item>
+        <item>@string/wifi_countrycode_sg</item>
+        <item>@string/wifi_countrycode_br</item>
+        <item>@string/wifi_countrycode_in</item>
     </string-array>
 
     <string-array name="wifi_countrycode_values" translatable="false">
@@ -586,10 +560,10 @@
         <item>600000</item>
     </string-array>
 
-    <string-array name="background_data_access_choices">
-        <item>Over mobile data &amp; WiFi</item>
-        <item>Only over WiFi</item>
-        <item>No access</item>
+    <string-array name="background_data_access_choices" translatable="false">
+        <item>@string/allow_background_both</item>
+        <item>@string/allow_background_wlan</item>
+        <item>@string/allow_background_none</item>
     </string-array>
 
     <!-- Weather temperature -->
diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml
index 1c61579..27ca707 100644
--- a/res/values/cm_strings.xml
+++ b/res/values/cm_strings.xml
@@ -207,6 +207,19 @@
     <!-- Wi-Fi settings screen, error message when the frequency band could not be set [CHAR LIMIT=50]. -->
     <string name="wifi_setting_countrycode_error">There was a problem setting the region code.</string>
 
+    <string name="wifi_countrycode_us">United States</string>
+    <string name="wifi_countrycode_ca">Canada, Taiwan</string>
+    <string name="wifi_countrycode_de">Germany</string>
+    <string name="wifi_countrycode_gb">Europe</string>
+    <string name="wifi_countrycode_jp">Japan, Russia</string>
+    <string name="wifi_countrycode_au">Australia</string>
+    <string name="wifi_countrycode_cn">China</string>
+    <string name="wifi_countrycode_kr">Korea</string>
+    <string name="wifi_countrycode_tr">South Africa, Turkey</string>
+    <string name="wifi_countrycode_sg">Israel, Singapore</string>
+    <string name="wifi_countrycode_br">Brazil</string>
+    <string name="wifi_countrycode_in">India</string>
+
     <!-- Profiles -->
     <string name="profile_menu_delete_title">Delete</string>
     <string name="profile_action_none">Leave unchanged</string>
@@ -658,6 +671,10 @@
     <string name="contrast_str">Contrast: <xliff:g id="contrast_value">%1$s</xliff:g></string>
     <string name="intensity_str">Intensity: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
 
+    <string name="screen_color_standard">Standard</string>
+    <string name="screen_color_vivid">Vivid</string>
+    <string name="screen_color_custom">Custom</string>
+
     <!-- LiveDisplay -->
     <string name="live_display_title" translatable="false">LiveDisplay</string>
     <string name="live_display_summary">Optimize your screen based on time of day and ambient conditions to improve readability and reduce eyestrain</string>