Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Added ETWS primary message default message support" am: 2d3fb48b39

Browse Source 
am: dfe1743b37

Change-Id: I71a1be66cb84ed8030df4ab9d406c390872f5346
This commit is contained in:
Jack Yu
2017-03-21 09:26:51 +00:00
committed by android-build-merger
parent 0b8756e735 dfe1743b37
commit 0f127ea929
2 changed files with 26 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
core/res/res/values/strings.xml
View File

@@ -4459,4 +4459,19 @@
<!-- Label used by Telephony code, assigned as the display name for conference calls [CHAR LIMIT=60] --> <!-- Label used by Telephony code, assigned as the display name for conference calls [CHAR LIMIT=60] -->
<string name="conference_call">Conference Call</string> <string name="conference_call">Conference Call</string>
<!-- Primary ETWS (Earthquake and Tsunami Warning System) default message for earthquake -->
<string name="etws_primary_default_message_earthquake">Stay calm and seek shelter nearby.</string>
<!-- Primary ETWS (Earthquake and Tsunami Warning System) default message for Tsunami -->
<string name="etws_primary_default_message_tsunami">Evacuate immediately from coastal regions and riverside areas to a safer place such as high ground.</string>
<!-- Primary ETWS (Earthquake and Tsunami Warning System) default message for earthquake and Tsunami -->
<string name="etws_primary_default_message_earthquake_and_tsunami">Stay calm and seek shelter nearby.</string>
<!-- Primary ETWS (Earthquake and Tsunami Warning System) default message for test -->
<string name="etws_primary_default_message_test">Emergency messages test</string>
<!-- Primary ETWS (Earthquake and Tsunami Warning System) default message for others -->
<string name="etws_primary_default_message_others"></string>
</resources> </resources>

11
core/res/res/values/symbols.xml
View File

@@ -2765,4 +2765,15 @@
<java-symbol type="drawable" name="lockscreen_selected" /> <java-symbol type="drawable" name="lockscreen_selected" />
<java-symbol type="string" name="config_defaultCellBroadcastReceiverPkg" /> <java-symbol type="string" name="config_defaultCellBroadcastReceiverPkg" />
<!-- ETWS primary messages -->
<java-symbol type="string" name="etws_primary_default_message_earthquake" />
<java-symbol type="string" name="etws_primary_default_message_tsunami" />
<java-symbol type="string" name="etws_primary_default_message_earthquake_and_tsunami" />
<java-symbol type="string" name="etws_primary_default_message_test" />
<java-symbol type="string" name="etws_primary_default_message_others" />
</resources> </resources>