diff options
| author | Jack Yu <jackyu@google.com> | 2018-03-27 17:41:59 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-03-27 17:41:59 +0000 |
| commit | 1a09b32095cdf48c953a5eca630e5d39a7bac2ee (patch) | |
| tree | 4322c08c1a254919ffeeaa84d5773aaec47893aa | |
| parent | 844c7f31fb765a660940eb6f977fc0697eda4372 (diff) | |
| parent | c59e90824439739f4f41c3c6e914c064023fff4b (diff) | |
| download | CellBroadcastReceiver-1a09b32095cdf48c953a5eca630e5d39a7bac2ee.tar.gz | |
Merge "Fixed emergency alert settings for Peru" into pi-dev
| -rw-r--r-- | res/values-mcc716/config.xml | 12 | ||||
| -rw-r--r-- | res/values-mcc716/strings.xml | 27 |
2 files changed, 36 insertions, 3 deletions
diff --git a/res/values-mcc716/config.xml b/res/values-mcc716/config.xml index 642c68022..714437f25 100644 --- a/res/values-mcc716/config.xml +++ b/res/values-mcc716/config.xml @@ -19,15 +19,17 @@ <!-- No need to show this for Peru users --> <bool name="show_cmas_settings">false</bool> - <!-- 4370, 4371, 919 --> + <!-- 4370, 4383, 50, 919 --> <string-array name="cmas_presidential_alerts_channels_range_strings" translatable="false"> - <item>0x1112-0x1113:rat=gsm, emergency=true</item> + <item>0x1112:rat=gsm, emergency=true</item> + <item>0x111F:rat=gsm, emergency=true</item> + <item>0x32:rat=gsm, emergency=true</item> <item>0x397:rat=gsm, emergency=true</item> </string-array> <!-- 4382 --> <string-array name="public_safety_messages_channels_range_strings" translatable="false"> - <item>0x111E:rat=gsm, emergency=false</item> + <item>0x111E:rat=gsm, emergency=true</item> </string-array> <!--4380, 519 --> @@ -52,6 +54,10 @@ <string-array name="operator_defined_alert_range_strings" translatable="false"></string-array> <bool name="show_date_time_title">true</bool> + <!-- For Peru users, we always play tones with full volume regardless the phone is in slient + mode or not --> + <bool name="use_full_volume">true</bool> + <!-- Emergecny alert tone duration set to 3 minute for Peru users --> <integer name="alert_duration">180000</integer> </resources> diff --git a/res/values-mcc716/strings.xml b/res/values-mcc716/strings.xml new file mode 100644 index 000000000..0958649fb --- /dev/null +++ b/res/values-mcc716/strings.xml @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2018 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"> + + <!-- Dialog title for all public safety message broadcasts. [CHAR LIMIT=50] --> + <string name="public_safety_message">Informative message</string> + + <!-- Preference title for enable public safety messages checkbox. --> + <string name="enable_public_safety_messages_title">Informative message</string> + <!-- Preference summary for enable public safety messages checkbox. --> + <string name="enable_public_safety_messages_summary" translatable="false"></string> +</resources>
\ No newline at end of file |