From 00f07cf138898dc3f93db025d8ab7b84f66310f6 Mon Sep 17 00:00:00 2001
From: Jordan Liu <jminjie@google.com>
Date: Tue, 23 Feb 2021 15:25:43 -0800
Subject: [PATCH] Turn off translations for string

Also move to config.xml and rename config_*.

Bug: 178490564
Test: no behavior change, follow up with testers to make sure manual
test is fixed

Change-Id: Idc1828c936121928e13ecf11f5437c3488f87565
---
 res/values/config.xml                          | 3 +++
 res/values/strings.xml                         | 3 ---
 res/xml/app_and_notification.xml               | 2 +-
 res/xml/configure_notification_settings_v2.xml | 2 +-
 res/xml/emergency_settings.xml                 | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/res/values/config.xml b/res/values/config.xml
index e923fbd3350..984906f718e 100755
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -506,4 +506,7 @@
 
     <!-- whether use partner overlay theme for outside setupwizard flow -->
     <bool name="config_suc_use_partner_resource">false</bool>
+
+    <!-- Cell broacast receiver package name -->
+    <string name="config_cell_broadcast_receiver_package" translatable="false">com.android.cellbroadcastreceiver.module</string>
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 5abba1faabd..46864c2a8ad 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -7519,9 +7519,6 @@
     <!-- Summary of multimedia messaging service settings.  [CHAR LIMIT=100] -->
     <string name="mms_message_summary">Send &amp; receive when mobile data is off</string>
 
-    <!-- Cell broacast receiver package name [DO NOT TRANSLATE] -->
-    <string name="cell_broadcast_receiver_package">com.android.cellbroadcastreceiver.module</string>
-
     <!-- Title of a preference for whether to allow data during calls that is shown when mobile
          data is turned off. This is needed for some multi-SIM scenarios, because the SIM that is
          default for data might not be available during a phone call. [CHAR LIMIT=60] -->
diff --git a/res/xml/app_and_notification.xml b/res/xml/app_and_notification.xml
index bd2e85ce127..49d8e9b85fd 100644
--- a/res/xml/app_and_notification.xml
+++ b/res/xml/app_and_notification.xml
@@ -90,7 +90,7 @@
         settings:useAdminDisabledSummary="true">
         <intent
             android:action="android.intent.action.MAIN"
-            android:targetPackage="@string/cell_broadcast_receiver_package"
+            android:targetPackage="@string/config_cell_broadcast_receiver_package"
             android:targetClass="com.android.cellbroadcastreceiver.CellBroadcastSettings"/>
     </com.android.settingslib.RestrictedPreference>
 
diff --git a/res/xml/configure_notification_settings_v2.xml b/res/xml/configure_notification_settings_v2.xml
index 6c3ec5292c2..902922087c6 100644
--- a/res/xml/configure_notification_settings_v2.xml
+++ b/res/xml/configure_notification_settings_v2.xml
@@ -109,7 +109,7 @@
             settings:useAdminDisabledSummary="true">
             <intent
                 android:action="android.intent.action.MAIN"
-                android:targetPackage="@string/cell_broadcast_receiver_package"
+                android:targetPackage="@string/config_cell_broadcast_receiver_package"
                 android:targetClass="com.android.cellbroadcastreceiver.CellBroadcastSettings"/>
         </com.android.settingslib.RestrictedPreference>
 
diff --git a/res/xml/emergency_settings.xml b/res/xml/emergency_settings.xml
index 774e3281014..28ae8b19c56 100644
--- a/res/xml/emergency_settings.xml
+++ b/res/xml/emergency_settings.xml
@@ -39,7 +39,7 @@
         settings:useAdminDisabledSummary="true">
         <intent
             android:action="android.intent.action.MAIN"
-            android:targetPackage="@string/cell_broadcast_receiver_package"
+            android:targetPackage="@string/config_cell_broadcast_receiver_package"
             android:targetClass="com.android.cellbroadcastreceiver.CellBroadcastSettings"/>
     </com.android.settingslib.RestrictedPreference>
 </PreferenceScreen>