Merge "Support the latest requirement of Qatar" into sc-mainline-prod

3 files changed, 79 insertions, 6 deletions

diff --git a/res/values-mcc427/config.xml b/res/values-mcc427/config.xml
index 381ebc1bf..f3fd36ca6 100644
--- a/res/values-mcc427/config.xml
+++ b/res/values-mcc427/config.xml
@@ -15,18 +15,39 @@
 -->
 
 <resources>
-    <!-- Channels to receive public safety messages -->
+    <!-- 4380, 4393 -->
+    <string-array name="required_monthly_test_range_strings" translatable="false">
+        <item>0x111C:type=info, rat=gsm, emergency=true</item>
+        <!-- additional language -->
+        <item>0x1129:type=info, rat=gsm, emergency=true</item>
+    </string-array>
+    <!-- Channels to receive public safety messages 4396, 4397-->
     <string-array name="public_safety_messages_channels_range_strings" translatable="false">
         <!-- Public safety messages -->
-        <item>0x112C:rat=gsm, emergency=true</item>
+        <item>0x112C:type=info, rat=gsm, emergency=true</item>
         <!-- Public safety messages for additional language -->
-        <item>0x112D:rat=gsm, emergency=true</item>
+        <item>0x112D:type=info, rat=gsm, emergency=true</item>
     </string-array>
-    <!-- Channels to receive state/local test messages -->
+    <!-- Channels to receive state/local test messages 4398, 4399-->
     <string-array name="state_local_test_alert_range_strings" translatable="false">
         <!-- state/local test -->
-        <item>0x112E:rat=gsm, emergency=true</item>
+        <item>0x112E:type=info, rat=gsm, emergency=true</item>
         <!-- state/local test additional language -->
-        <item>0x112F:rat=gsm, emergency=true</item>
+        <item>0x112F:type=info, rat=gsm, emergency=true</item>
     </string-array>
+
+    <!-- Whether to show extreme alert settings -->
+    <bool name="show_extreme_alert_settings">false</bool>
+    <!-- Whether to show severe alert settings -->
+    <bool name="show_severe_alert_settings">false</bool>
+    <!-- Whether to display state/local test settings, some countries/carriers want to enable it by default and not allow users to disable -->
+    <bool name="show_state_local_test_settings">false</bool>
+    <!-- Whether to show emergency alert settings -->
+    <bool name="show_emergency_alert_test_settings">false</bool>
+    <!-- State local test alerts toggle default value -->
+    <bool name="state_local_test_alerts_enabled_default">true</bool>
+    <!-- Exercise test alerts toggle default value -->
+    <bool name="test_exercise_alerts_enabled_default">true</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-mcc427/strings.xml b/res/values-mcc427/strings.xml
new file mode 100644
index 000000000..a4943c1fd
--- /dev/null
+++ b/res/values-mcc427/strings.xml
@@ -0,0 +1,50 @@
+<?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">
+    <!-- CMAS dialog title for national level alert. [CHAR LIMIT=50] -->
+    <string name="cmas_presidential_level_alert">National Emergency Alert</string>
+    <!-- Show CMAS opt-out dialog on first non-national alert. [CHAR LIMIT=100] -->
+    <string name="show_cmas_opt_out_summary">Show an opt-out dialog after displaying the first alert (other than National alert).</string>
+    <!-- Preference title for enable National threat alerts checkbox. [CHAR LIMIT=40] -->
+    <string name="enable_cmas_presidential_alerts_title">National Emergency Alerts</string>
+    <!-- CMAS dialog title for extreme alert. [CHAR LIMIT=50] -->
+    <string name="cmas_extreme_alert">Emergency Alert</string>
+    <!-- CMAS dialog title for extreme alert with extreme severity, immediate urgency, and observed certainty. [CHAR LIMIT=50] -->
+    <string name="cmas_extreme_immediate_observed_alert">Emergency Alert</string>
+    <!-- CMAS dialog title for extreme alert with extreme severity, immediate urgency,  and likely certainty. [CHAR LIMIT=50] -->
+    <string name="cmas_extreme_immediate_likely_alert">Emergency Alert</string>
+    <!-- CMAS dialog title for severe alert. [CHAR LIMIT=50] -->
+    <string name="cmas_severe_alert">Emergency Alert</string>
+    <!-- CMAS dialog title for child abduction emergency (Amber Alert). [CHAR LIMIT=50] -->
+    <string name="cmas_amber_alert">Warning Alert</string>
+    <!-- CMAS dialog title for required monthly test. [CHAR LIMIT=50] -->
+    <string name="cmas_required_monthly_test">Test Alert</string>
+    <!-- CMAS dialog title for CMAS Exercise. [CHAR LIMIT=50] -->
+    <string name="cmas_exercise_alert">Exercise</string>
+    <!-- Dialog title for all public safety message broadcasts. [CHAR LIMIT=50] -->
+    <string name="public_safety_message">Public Safety Alert</string>
+    <!-- Dialog title for all state/local test alerts. [CHAR LIMIT=50] -->
+    <string name="state_local_test_alert">Test Alert</string>
+
+    <!-- Preference title for enable CMAS amber alerts checkbox. [CHAR LIMIT=50] -->
+    <string name="enable_cmas_amber_alerts_title">Warning alerts</string>
+    <!-- Preference title for enable public safety messages checkbox. [CHAR LIMIT=100] -->
+    <string name="enable_public_safety_messages_title">Public safety alerts</string>
+    <!-- Preference title for other test alerts checkbox. [CHAR LIMIT=50] -->
+    <string name="enable_cmas_test_alerts_title">Test alerts</string>
+</resources>
diff --git a/res/values/config.xml b/res/values/config.xml
index ffc722a81..9e65a6f87 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -188,6 +188,8 @@
     <string-array name="cmas_roaming_network_strings" translatable="false">
         <!-- France -->
         <item>208</item>
+        <!-- Qatar -->
+        <item>427</item>
     </string-array>
 
     <!-- Values that are retrieved from the ListPreference.