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

Commit 2256bef5 authored by Chen Xu's avatar Chen Xu Committed by android-build-merger
Browse files

Merge "rename notification channel" into oc-mr1-dev 

am: 23228db8

Change-Id: Ic7de8fddbb7fec88aa9b8b945b2b45601be6b0b1
parents 43c39408 23228db8

core/res/res/values/strings.xml

+2 −2
Original line number Diff line number Diff line
@@ -160,8 +160,8 @@ 
    <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 mobile data status notifications. -->

    <string name="notification_channel_mobile_data_status">Mobile data status</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. -->

core/res/res/values/symbols.xml

+1 −1
Original line number Diff line number Diff line
@@ -540,7 +540,7 @@ 
  <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_mobile_data_status" />

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