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

Commit 102f3248 authored by Chen Xu's avatar Chen Xu Committed by android-build-merger
Browse files

Merge "telephony service support notification channel" into oc-dev 

am: 53d9e9d0

Change-Id: I51432b33bce1cd957d2c1a139513d913a3b2c178
parents de8f784b 53d9e9d0

core/res/res/values/strings.xml

+15 −0
Original line number Diff line number Diff line
@@ -212,6 +212,21 @@ 
    <!-- Displayed to tell the user that they should switch their network preference. -->

    <string name="NetworkPreferenceSwitchSummary">To improve reception, try changing the type selected at System &gt; Network &amp; Internet &gt; Mobile networks &gt; Preferred network type."</string>



    <!-- Telephony notification channel name for a channel containing network alert notifications. -->

    <string name="notification_channel_network_alert">Alerts</string>

    <!-- Telephony notification channel name for a channel containing call forwarding notifications. -->

    <string name="notification_channel_call_forward">Call forwarding</string>

    <!-- Telephony notification channel name for a channel containing emergency callback mode notifications. -->

    <string name="notification_channel_emergency_callback">Emergency callback mode</string>

    <!-- Telephony notification channel name for a channel containing mobile data alert notifications. -->

    <string name="notification_channel_mobile_data_alert">Mobile data alerts</string>

    <!-- Telephony notification channel name for a channel containing sms notifications. -->

    <string name="notification_channel_sms">SMS messages</string>

    <!-- Telephony notification channel name for a channel containing voice mail notifications. -->

    <string name="notification_channel_voice_mail">Voicemail messages</string>

    <!-- Telephony notification channel name for a channel containing wifi calling status notifications. -->

    <string name="notification_channel_wfc">Wi-Fi calling</string>



    <!-- Displayed to tell the user that peer changed TTY mode -->

    <string name="peerTtyModeFull">Peer requested TTY Mode FULL</string>

    <string name="peerTtyModeHco">Peer requested TTY Mode HCO</string>

core/res/res/values/symbols.xml

+7 −0
Original line number Diff line number Diff line
@@ -523,6 +523,13 @@ 
  <java-symbol type="string" name="RestrictedOnDataContent" />

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

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

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

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

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

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

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

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

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

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