Bug 1488874 - Part 2: Notification channel name changes. r=nalexander
authorJan Henning <jh+bugzilla@buttercookie.de>
Mon, 05 Nov 2018 18:54:24 +0000
changeset 444444 4aeb1d183e959689fa7f4d785128637605bc34a6
parent 444443 a18675248eb604d28e6faedab7e2dcadc14a5418
child 444445 e5cd93207b3afab072daed9c7aeb216123b92797
push id34996
push userrgurzau@mozilla.com
push dateTue, 06 Nov 2018 09:53:23 +0000
treeherdermozilla-central@e160f0a60e4f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersnalexander
bugs1488874
milestone65.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1488874 - Part 2: Notification channel name changes. r=nalexander The media and default channels are changed as per comment 2 of this bug. I'm keeping the location service string as it is, though, as our settings UI uses "&vendorShortName; Location Service" as well. Differential Revision: https://phabricator.services.mozilla.com/D10771
mobile/android/base/java/org/mozilla/gecko/notifications/NotificationHelper.java
mobile/android/base/locales/en-US/android_strings.dtd
mobile/android/base/strings.xml.in
--- a/mobile/android/base/java/org/mozilla/gecko/notifications/NotificationHelper.java
+++ b/mobile/android/base/java/org/mozilla/gecko/notifications/NotificationHelper.java
@@ -237,17 +237,17 @@ public final class NotificationHelper im
                     channel = new NotificationChannel(mDefinedNotificationChannels.get(definedChannel),
                             mContext.getString(R.string.download_notification_channel),
                             NotificationManager.IMPORTANCE_LOW);
                 }
                 break;
 
                 case MEDIA: {
                     channel = new NotificationChannel(mDefinedNotificationChannels.get(definedChannel),
-                            mContext.getString(R.string.media_notification_channel),
+                            mContext.getString(R.string.media_notification_channel2),
                             NotificationManager.IMPORTANCE_LOW);
                 }
                 break;
 
                 case UPDATER: {
                     channel = new NotificationChannel(mDefinedNotificationChannels.get(definedChannel),
                             mContext.getString(R.string.updater_notification_channel),
                             NotificationManager.IMPORTANCE_LOW);
@@ -258,32 +258,32 @@ public final class NotificationHelper im
                     channel = new NotificationChannel(mDefinedNotificationChannels.get(definedChannel),
                             mContext.getString(R.string.synced_tabs_notification_channel),
                             NotificationManager.IMPORTANCE_HIGH);
                 }
                 break;
 
                 case LP_DEFAULT: {
                     channel = new NotificationChannel(mDefinedNotificationChannels.get(definedChannel),
-                            mContext.getString(R.string.leanplum_default_notifications_channel),
+                            mContext.getString(R.string.leanplum_default_notifications_channel2),
                             NotificationManager.IMPORTANCE_LOW);
                 }
                 break;
 
                 case SITE_NOTIFICATIONS: {
                     channel = new NotificationChannel(mDefinedNotificationChannels.get(definedChannel),
                             mContext.getString(R.string.site_notifications_channel),
                             NotificationManager.IMPORTANCE_DEFAULT);
                 }
                 break;
 
                 case DEFAULT:
                 default: {
                     channel = new NotificationChannel(mDefinedNotificationChannels.get(definedChannel),
-                            mContext.getString(R.string.default_notification_channel),
+                            mContext.getString(R.string.default_notification_channel2),
                             NotificationManager.IMPORTANCE_LOW);
                 }
                 break;
             }
 
             manager.createNotificationChannel(channel);
         }
     }
--- a/mobile/android/base/locales/en-US/android_strings.dtd
+++ b/mobile/android/base/locales/en-US/android_strings.dtd
@@ -892,19 +892,19 @@ See also https://bug1409261.bmoattachmen
 <!-- Used by accessibility services to identify the play/pause buttons shown in the
 Picture-in-picture mini window -->
 <!ENTITY pip_play_button_title "Play">
 <!ENTITY pip_play_button_description "Resume playing">
 <!ENTITY pip_pause_button_title "Pause">
 <!ENTITY pip_pause_button_description "Pause playing">
 
 <!-- Notification channels names -->
-<!ENTITY default_notification_channel "&brandShortName;">
+<!ENTITY default_notification_channel2 "Browser">
 <!ENTITY mls_notification_channel "&vendorShortName; Location Service">
 <!ENTITY download_notification_channel "Downloads">
-<!ENTITY media_notification_channel "Media playback">
+<!ENTITY media_notification_channel2 "Sound and video">
 <!-- These push notifications come without a specific channel and/or name from Leanplum -->
-<!ENTITY leanplum_default_notifications_channel "&brandShortName; Push notifications">
+<!ENTITY leanplum_default_notifications_channel2 "&vendorShortName; tips and tricks">
 <!ENTITY updater_notification_channel "App updates">
 <!ENTITY synced_tabs_notification_channel "Synced tabs">
 <!-- LOCALIZATION NOTE (site_notifications_channel): This is for system notifications displayed by
 web sites through the HTML Notifications API. -->
 <!ENTITY site_notifications_channel "Site notifications">
--- a/mobile/android/base/strings.xml.in
+++ b/mobile/android/base/strings.xml.in
@@ -642,17 +642,17 @@
   <string name="pwa_onboarding_sumo">&pwa_onboarding_sumo;</string>
   <string name="pwa_continue_to_website">&pwa_continue_to_website;</string>
 
   <string name="pip_play_button_title">&pip_play_button_title;</string>
   <string name="pip_play_button_description">&pip_play_button_description;</string>
   <string name="pip_pause_button_title">&pip_pause_button_title;</string>
   <string name="pip_pause_button_description">&pip_pause_button_description;</string>
 
-  <string name="default_notification_channel">&default_notification_channel;</string>
+  <string name="default_notification_channel2">&default_notification_channel2;</string>
   <string name="mls_notification_channel">&mls_notification_channel;</string>
-  <string name="media_notification_channel">&media_notification_channel;</string>
+  <string name="media_notification_channel2">&media_notification_channel2;</string>
   <string name="download_notification_channel">&download_notification_channel;</string>
-  <string name="leanplum_default_notifications_channel">&leanplum_default_notifications_channel;</string>
+  <string name="leanplum_default_notifications_channel2">&leanplum_default_notifications_channel2;</string>
   <string name="updater_notification_channel">&updater_notification_channel;</string>
   <string name="synced_tabs_notification_channel">&synced_tabs_notification_channel;</string>
   <string name="site_notifications_channel">&site_notifications_channel;</string>
 </resources>