Merge "Support emergency alert for Norway." into tm-mainline-prod

6 files changed, 199 insertions, 0 deletions

diff --git a/res/values-mcc242/config.xml b/res/values-mcc242/config.xml
new file mode 100644
index 000000000..dd7c8b229
--- /dev/null
+++ b/res/values-mcc242/config.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<resources>
+  <!-- 4370, 4383 -->
+  <string-array name="cmas_presidential_alerts_channels_range_strings" translatable="false">
+    <item>0x1112:rat=gsm, emergency=true, always_on=true, override_dnd=true</item>
+    <!-- additional language -->
+    <item>0x111F:rat=gsm, emergency=true, always_on=true, override_dnd=true, filter_language=true</item>
+  </string-array>
+  <!-- 4371, 4384 -->
+  <string-array name="cmas_alert_extreme_channels_range_strings" translatable="false">
+    <item>0x1113:type=mute, rat=gsm, emergency=true, always_on=true</item>
+    <!-- additional language -->
+    <item>0x1120:type=mute, rat=gsm, emergency=true, always_on=true, filter_language=true</item>
+  </string-array>
+  <!-- 4375~4376, 4388~4389 -->
+  <string-array name="cmas_alerts_severe_range_strings" translatable="false">
+    <item>0x1117-0x1118:rat=gsm, emergency=true, override_dnd=true</item>
+    <!-- additional language -->
+    <item>0x1124-0x1125:rat=gsm, emergency=true, override_dnd=true, filter_language=true</item>
+  </string-array>
+  <!-- 4380, 4393 -->
+  <string-array name="required_monthly_test_range_strings" translatable="false">
+    <item>0x111C:rat=gsm, emergency=true, override_dnd=true</item>
+    <!-- additional language -->
+    <item>0x1129:rat=gsm, emergency=true, override_dnd=true, filter_language=true</item>
+  </string-array>
+  <!-- 4381, 4394 -->
+  <string-array name="exercise_alert_range_strings" translatable="false">
+    <item>0x111D:rat=gsm, emergency=true, override_dnd=true</item>
+    <!-- additional language -->
+    <item>0x112A:rat=gsm, emergency=true, override_dnd=true, filter_language=true</item>
+  </string-array>
+
+  <string-array name="cmas_amber_alerts_channels_range_strings" translatable="false"/>
+  <string-array name="operator_defined_alert_range_strings" translatable="false"/>
+  <string-array name="etws_alerts_range_strings" translatable="false" />
+  <string-array name="etws_test_alerts_range_strings" translatable="false" />
+
+  <!-- Whether to show extreme alert settings -->
+  <bool name="show_extreme_alert_settings">false</bool>
+  <!-- Whether to show amber alert settings -->
+  <bool name="show_amber_alert_settings">false</bool>
+  <!-- Whether to display exercise test settings when testing mode is off. -->
+  <bool name="show_exercise_settings">false</bool>
+  <!-- whether to display a separate exercise test settings. today, most of time, exercise channels was controlled by the main test toggle. -->
+  <bool name="show_separate_exercise_settings">true</bool>
+</resources>
diff --git a/res/values-mcc242/strings.xml b/res/values-mcc242/strings.xml
new file mode 100644
index 000000000..b53914138
--- /dev/null
+++ b/res/values-mcc242/strings.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+
+  <!-- Preference title for enable CMAS severe threat alerts checkbox. [CHAR LIMIT=50] -->
+  <!-- Required Norwegian (nb) translation for this message: "Viktig melding" -->
+  <string name="enable_cmas_severe_threat_alerts_title">Important warning</string>
+  <!-- Preference summary for enable CMAS severe threat alerts checkbox. [CHAR LIMIT=100] -->
+  <string name="enable_cmas_severe_threat_alerts_summary"/>
+
+  <!-- Preference title for enable public safety messages checkbox. [CHAR LIMIT=100] -->
+  <!-- Required Norwegian (nb) translation for this message: "Viktig melding" -->
+  <string name="enable_public_safety_messages_title">Important warning</string>
+  <!-- Preference summary for enable public safety messages checkbox. [CHAR LIMIT=100] -->
+  <string name="enable_public_safety_messages_summary"/>
+
+  <!-- Preference title for other test alerts checkbox. [CHAR LIMIT=50] -->
+  <!-- Required Norwegian (nb) translation for this message: "Test" -->
+  <string name="enable_cmas_test_alerts_title">Test</string>
+  <!-- Preference summary for other test alerts checkbox. [CHAR LIMIT=125] -->
+  <string name="enable_cmas_test_alerts_summary"/>
+
+  <!-- Preference title for exercise test alerts checkbox. [CHAR LIMIT=50] -->
+  <!-- Required Norwegian (nb) translation for this message: "Øvelse" -->
+  <string name="enable_exercise_test_alerts_title">@string/cmas_exercise_alert</string>
+  <!-- Preference summary for exercise test alerts checkbox. [CHAR LIMIT=125] -->
+  <string name="enable_exercise_test_alerts_summary"/>
+
+  <!-- CMAS dialog title for presidential level alert. [CHAR LIMIT=50] -->
+  <!-- Required Norwegian (nb) translation for this message: "Akutt fare" -->
+  <string name="cmas_presidential_level_alert">Immediate danger</string>
+  <!-- CMAS dialog title for extreme alert. [CHAR LIMIT=50] -->
+  <!-- Required Norwegian (nb) translation for this message: "Akutt fare" -->
+  <string name="cmas_extreme_alert">Immediate danger</string>
+  <!-- CMAS dialog title for severe alert. [CHAR LIMIT=50] -->
+  <!-- Required Norwegian (nb) translation for this message: "Viktig melding" -->
+  <string name="cmas_severe_alert">Important warning</string>
+  <!-- Dialog title for all public safety message broadcasts. [CHAR LIMIT=50] -->
+  <!-- Required Norwegian (nb) translation for this message: "Viktig melding" -->
+  <string name="public_safety_message">Important warning</string>
+  <!-- CMAS dialog title for required monthly test. [CHAR LIMIT=50] -->
+  <!-- Required Norwegian (nb) translation for this message: "Test" -->
+  <string name="cmas_required_monthly_test">Test</string>
+  <!-- CMAS dialog title for CMAS Exercise. [CHAR LIMIT=50] -->
+  <!-- Required Norwegian (nb) translation for this message: "Øvelse" -->
+  <string name="cmas_exercise_alert">Exercise</string>
+
+</resources>
diff --git a/res/values/config.xml b/res/values/config.xml
index 09b6933fb..61003e2b8 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -192,6 +192,8 @@
         <item>427</item>
         <!-- Germany -->
         <item>262</item>
+        <!-- Norway -->
+        <item>242</item>
         <!-- Italy -->
         <item>222</item>
     </string-array>
diff --git a/tests/compliancetests/assets/emergency_alert_channels.json b/tests/compliancetests/assets/emergency_alert_channels.json
index 7f884b83d..1faba01c0 100644
--- a/tests/compliancetests/assets/emergency_alert_channels.json
+++ b/tests/compliancetests/assets/emergency_alert_channels.json
@@ -187,6 +187,60 @@
       "test_mode": "true"
     }
   },
+  "norway": {
+    "4370": {
+      "title": "Immediate danger",  // 'Akutt fare' == 'Immediate danger'
+      "default_value": "true",
+      "toggle_avail": "false"
+    },
+    "4383": {
+      "title": "Immediate danger", // 'Akutt fare' == 'Immediate danger'
+      "default_value": "true",
+      "toggle_avail": "false"
+    },
+    "4371": {
+      "title": "Immediate danger", // 'Akutt fare' == 'Immediate danger'
+      "default_value": "true",
+      "toggle_avail": "false"
+    },
+    "4384": {
+      "title": "Immediate danger", // 'Akutt fare' == 'Immediate danger'
+      "default_value": "true",
+      "toggle_avail": "false"
+    },
+    "4375": {
+      "title": "Important warning", // 'Viktig melding' == 'Important warning'
+      "default_value": "true",
+      "toggle_avail": "false",
+      "end_channel": "4376"
+    },
+    "4388": {
+      "title": "Important warning", // 'Viktig melding' == 'Important warning'
+      "default_value": "true",
+      "toggle_avail": "true",
+      "end_channel": "4389"
+    },
+    "4380": {
+      "title": "Test",  // 'Test' == 'Test'
+      "default_value": "false",
+      "toggle_avail": "true"
+    },
+    "4393": {
+      "title": "Test",  // 'Test' == 'Test'
+      "default_value": "false",
+      "toggle_avail": "true"
+    },
+    "4381": {
+      "title": "Exercise", // 'Øvelse' == 'Exercise'
+      "default_value": "false",
+      "toggle_avail": "true"
+    },
+    "4394": {
+      "title": "Exercise", // 'Øvelse' == 'Exercise'
+      "default_value": "false",
+      "toggle_avail": "true"
+    }
+  },
   "peru_entel": {
     "4352": {
       "title": "",
diff --git a/tests/compliancetests/assets/emergency_alert_settings.json b/tests/compliancetests/assets/emergency_alert_settings.json
index 8129a7564..dba55f0d9 100644
--- a/tests/compliancetests/assets/emergency_alert_settings.json
+++ b/tests/compliancetests/assets/emergency_alert_settings.json
@@ -415,6 +415,20 @@
       "toggle_avail": "true"
     }
   },
+  "norway": {
+    "Important warning": { //"Viktig melding"
+      "default_value": "true",
+      "toggle_avail": "true"
+    },
+    "Test": { //"Test"
+      "default_value": "false",
+      "toggle_avail": "true"
+    },
+    "Vibration": {
+      "default_value": "true",
+      "toggle_avail": "true"
+    }
+  },
   "oman": {
     "تمارين": { //"Exercises Alerts"
       "default_value": "true",
diff --git a/tests/compliancetests/assets/region_plmn_list.json b/tests/compliancetests/assets/region_plmn_list.json
index f59e10922..260941cb2 100644
--- a/tests/compliancetests/assets/region_plmn_list.json
+++ b/tests/compliancetests/assets/region_plmn_list.json
@@ -27,6 +27,10 @@
     "mccmnc": "53001",
     "imsi": "530010123456789"
   },
+  "norway": {
+    "mccmnc": "24201",
+    "imsi": "242010123456789"
+  },
   "hongkong": {
     "mccmnc": "45406",
     "imsi": "454060123456789"