Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dfe1743b authored by Jack Yu's avatar Jack Yu Committed by android-build-merger
Browse files

Merge "Added ETWS primary message default message support" 

am: 2d3fb48b

Change-Id: Ib03378e2f9c2da53b5efbedde08b20acc0b8c199
parents 23d6ba12 2d3fb48b

core/res/res/values/strings.xml

+15 −0
Original line number Diff line number Diff line
@@ -4459,4 +4459,19 @@ 


    <!-- Label used by Telephony code, assigned as the display name for conference calls [CHAR LIMIT=60] -->

    <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>

core/res/res/values/symbols.xml

+11 −0
Original line number Diff line number Diff line
@@ -2765,4 +2765,15 @@ 
  <java-symbol type="drawable" name="lockscreen_selected" />



  <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>