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

Commit 3a647cd8 authored by Jordan Liu's avatar Jordan Liu Committed by android-build-merger
Browse files

Merge "Add multisim notifications for SST" 

am: 1a6228e5

Change-Id: I2fc3c9195da6bf47d6dcaca26d793e956619ccfa
parents af2fafe7 1a6228e5

core/res/res/values/strings.xml

+9 −0
Original line number Diff line number Diff line
@@ -149,6 +149,9 @@ 
    <!-- Notification content to tell the user that voice/data/emergency service is blocked by access control. -->

    <string name="RestrictedStateContent">Temporarily turned off by your carrier</string>



    <!-- Notification content to tell the user that voice/data/emergency service is blocked by access control when multiple SIMs are active. -->

    <string name="RestrictedStateContentMsimTemplate">Temporarily turned off by your carrier for SIM <xliff:g id="simNumber" example="1">%d</xliff:g></string>



    <!-- Displayed to tell the user that they should switch their network preference. -->

    <string name="NetworkPreferenceSwitchTitle">Can\u2019t reach mobile network</string>

    <!-- Displayed to tell the user that they should switch their network preference. -->
@@ -4681,6 +4684,12 @@ 
    <string name="mmcc_illegal_ms">SIM not allowed for voice</string>

    <string name="mmcc_illegal_me">Phone not allowed for voice</string>



    <!-- Title of notification when UE fails to register network with MM reject cause code when multiple SIMs are active. -->

    <string name="mmcc_authentication_reject_msim_template">SIM <xliff:g id="simNumber" example="1">%d</xliff:g> not allowed</string>

    <string name="mmcc_imsi_unknown_in_hlr_msim_template">SIM <xliff:g id="simNumber" example="1">%d</xliff:g> not provisioned</string>

    <string name="mmcc_illegal_ms_msim_template">SIM <xliff:g id="simNumber" example="1">%d</xliff:g> not allowed</string>

    <string name="mmcc_illegal_me_msim_template">SIM <xliff:g id="simNumber" example="1">%d</xliff:g> not allowed</string>



    <!-- Popup window default title to be read by a screen reader-->

    <string name="popup_window_default_title">Popup Window</string>

</resources>

core/res/res/values/symbols.xml

+5 −0
Original line number Diff line number Diff line
@@ -547,6 +547,7 @@ 
  <java-symbol type="string" name="RestrictedOnEmergencyTitle" />

  <java-symbol type="string" name="RestrictedOnNormalTitle" />

  <java-symbol type="string" name="RestrictedStateContent" />

  <java-symbol type="string" name="RestrictedStateContentMsimTemplate" />

  <java-symbol type="string" name="notification_channel_network_alert" />

  <java-symbol type="string" name="notification_channel_call_forward" />

  <java-symbol type="string" name="notification_channel_emergency_callback" />
@@ -1956,6 +1957,10 @@ 
  <java-symbol type="string" name="mmcc_imsi_unknown_in_hlr" />

  <java-symbol type="string" name="mmcc_illegal_ms" />

  <java-symbol type="string" name="mmcc_illegal_me" />

  <java-symbol type="string" name="mmcc_authentication_reject_msim_template" />

  <java-symbol type="string" name="mmcc_imsi_unknown_in_hlr_msim_template" />

  <java-symbol type="string" name="mmcc_illegal_ms_msim_template" />

  <java-symbol type="string" name="mmcc_illegal_me_msim_template" />

  <java-symbol type="string" name="notification_listener_binding_label" />

  <java-symbol type="string" name="vr_listener_binding_label" />

  <java-symbol type="string" name="condition_provider_service_binding_label" />