diff options
| author | youngtaecha <youngtaecha@google.com> | 2023-06-26 03:41:35 +0000 |
|---|---|---|
| committer | Youngtae Cha <youngtaecha@google.com> | 2023-08-30 16:49:20 +0000 |
| commit | ecfb905a3c2b95f098fa7b07c2fd1e26557a1ed2 (patch) | |
| tree | 8625fc684ee804f61eb616dad7d06eb362573c16 /res | |
| parent | 608563a7cb605b7854435a98b07d92ad322bd716 (diff) | |
| download | CellBroadcastReceiver-ecfb905a3c2b95f098fa7b07c2fd1e26557a1ed2.tar.gz | |
Support grayed out toggle for extreme channel
Bug: 290149779
Test: Manual
Test: atest CellBroadcastReceiverOemUnitTests
Test: atest CellBroadcastReceiverComplianceTests(https://android-build.googleplex.com/builds/abtd/run/L87400000962744029)
Change-Id: Idbb476a0f5795dcc82eccfc61337b2c732f1a103
Diffstat (limited to 'res')
| -rw-r--r-- | res/values-mcc724/config.xml | 5 | ||||
| -rw-r--r-- | res/values-mcc724/strings.xml | 9 | ||||
| -rw-r--r-- | res/values/config.xml | 3 |
3 files changed, 15 insertions, 2 deletions
diff --git a/res/values-mcc724/config.xml b/res/values-mcc724/config.xml index 0aab9cbbc..30b254192 100644 --- a/res/values-mcc724/config.xml +++ b/res/values-mcc724/config.xml @@ -41,8 +41,6 @@ <item>0x032:type=area, emergency=false</item> </string-array> - <!-- Whether to show extreme alert settings --> - <bool name="show_extreme_alert_settings">false</bool> <!-- Show area update info settings in CellBroadcastReceiver and information in SIM status in Settings app --> <bool name="config_showAreaUpdateInfoSettings">true</bool> <!-- Whether to display exercise test settings when testing mode is off. --> @@ -58,4 +56,7 @@ <string-array name="etws_alerts_range_strings" translatable="false"></string-array> <string-array name="etws_test_alerts_range_strings" translatable="false"></string-array> + <!-- Whether to allow user to disable opt-out --> + <bool name="disable_extreme_alert_settings">true</bool> + </resources> diff --git a/res/values-mcc724/strings.xml b/res/values-mcc724/strings.xml index 8b04b3e20..8c85b5cc3 100644 --- a/res/values-mcc724/strings.xml +++ b/res/values-mcc724/strings.xml @@ -33,6 +33,15 @@ <!-- Required spanish (es) translation for this message: Alerta de prueba técnica --> <string name="cmas_exercise_alert">Technical test alerts</string> + <!-- Preference title for enable CMAS extreme threat alerts checkbox. [CHAR LIMIT=50] --> + <!-- Required Portuguese (pt) translation for this message: Alerta Extremo --> + <!-- Required spanish (es) translation for this message: Alerta Extrema --> + <string name="enable_cmas_extreme_threat_alerts_title">Extreme Threats</string> + <!-- Preference summary for enable CMAS severe threat alerts checkbox. [CHAR LIMIT=100] --> + <!-- Required Portuguese (pt) translation for this message: Ameaças extremas à vida ou à propriedade --> + <!-- Required spanish (es) translation for this message: Amenazas extremas a la vida y la propiedad --> + <string name="enable_cmas_extreme_threat_alerts_summary">Extreme threats to life and property</string> + <!-- Preference title for enable CMAS severe threat alerts checkbox. [CHAR LIMIT=50] --> <!-- Required Portuguese (pt) translation for this message: Alerta Severo --> <!-- Required spanish (es) translation for this message: Alerta Severa --> diff --git a/res/values/config.xml b/res/values/config.xml index a6c90569b..9f83cb2e9 100644 --- a/res/values/config.xml +++ b/res/values/config.xml @@ -73,6 +73,9 @@ <bool name="always_mark_sms_read">false</bool> <!-- Whether to retry message history data migration after db creation --> <bool name="retry_message_history_data_migration">false</bool> + <!-- Whether to disable extreme alert settings --> + <!-- To support 'true' it needs to be set show_extreme_alert_settings=true, always_on=true : true --> + <bool name="disable_extreme_alert_settings">false</bool> <!-- Section for switch default value --> <!-- Main toggle default value --> |