commit cc39557d875ab083485b56903a8c72d16b10174d
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Mar 06 22:46:39 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Mar 06 22:46:39 2019 +0000
tree 5ec825aef96a8b4bdd268b655f341be7c2b443cd
parent d6d4de3c5c60509c7ec8d7016766ba709993cc81
parent 88a2e34e37500cb370b5b56ba5e40c52a5336373

Merge "Add translatable="false" for config array"

res/values/arrays.xml

diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 03e40aa..6a03582 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -1268,7 +1268,7 @@
         <item>NV</item>
     </string-array>
     <!-- Values for CDMA subscription-->
-    <string-array name="cdma_subscription_values">
+    <string-array name="cdma_subscription_values" translatable="false">
         <item>"0"</item>
         <item>"1"</item>
     </string-array>
@@ -1351,7 +1351,7 @@
         <item>LTE / GSM / UMTS</item>
     </string-array>
 
-    <string-array name="preferred_network_mode_values_world_mode">
+    <string-array name="preferred_network_mode_values_world_mode" translatable="false">
         <item>"10"</item>
         <item>"8"</item>
         <item>"9"</item>

res/values/strings.xml

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 0d6eaeb..c4414db 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -2489,7 +2489,7 @@
         <item>Mobile</item>
         <item>Wi-Fi only</item>
     </string-array>
-    <string-array name="wifi_calling_mode_values">
+    <string-array name="wifi_calling_mode_values" translatable="false">
         <item>"2"</item>
         <item>"1"</item>
         <item>"0"</item>
@@ -2502,7 +2502,7 @@
         <item>Wi-Fi</item>
         <item>Mobile</item>
     </string-array>
-    <string-array name="wifi_calling_mode_values_without_wifi_only">
+    <string-array name="wifi_calling_mode_values_without_wifi_only" translatable="false">
         <item>"2"</item>
         <item>"1"</item>
     </string-array>