Bug 1102814 - Use the `notification' channel to play keypad touch ton…

…es r=thills
mozilla-b2g · Feb 6, 2015 · cbc34ea · cbc34ea
1 parent f6b7948
commit cbc34ea
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 25 deletions.
diff --git a/apps/communications/contacts/js/contacts.js b/apps/communications/contacts/js/contacts.js
@@ -263,12 +263,11 @@ var Contacts = (function() {
 
     window.addEventListener('listRendered', loadDeferredActions);
 
-    /* XXX: Don't specify a default volume control channel as we want to stick
-     * with the default one as a workaround for bug 1092346. Once that bug is
-     * fixed please add back the following line:
-     *
-     * navigator.mozAudioChannelManager.volumeControlChannel = 'notification';
-     */
+    /* Tell the audio channel manager that we want to adjust the "notification"
+     * channel when the user presses the volumeup/volumedown buttons. */
+    if (navigator.mozAudioChannelManager) {
+      navigator.mozAudioChannelManager.volumeControlChannel = 'notification';
+    }
   };
 
   var initContactsList = function initContactsList() {

diff --git a/apps/communications/dialer/js/index.js b/apps/communications/dialer/js/index.js
@@ -10,12 +10,11 @@ function onLoadDialer() {
 
   window.removeEventListener('load', onLoadDialer);
 
-  /* XXX: Don't specify a default volume control channel as we want to stick
-   * with the default one as a workaround for bug 1092346. Once that bug is
-   * fixed please add back the following line:
-   *
-   * navigator.mozAudioChannelManager.volumeControlChannel = 'notification';
-   */
+  /* Tell the audio channel manager that we want to adjust the "notification"
+   * channel when the user presses the volumeup/volumedown buttons. */
+  if (navigator.mozAudioChannelManager) {
+    navigator.mozAudioChannelManager.volumeControlChannel = 'notification';
+  }
 
   KeypadManager.init(/* oncall */ false);
   // Keypad (app core content) is now bound

diff --git a/apps/communications/dialer/test/unit/keypad_test.js b/apps/communications/dialer/test/unit/keypad_test.js
@@ -107,13 +107,13 @@ suite('dialer/keypad', function() {
   });
 
   suite('Keypad Manager', function() {
-    test('initializates the TonePlayer to use the default audio channel',
+    test('initializates the TonePlayer to use the notification audio channel',
     function() {
       this.sinon.spy(MockTonePlayer, 'init');
       KeypadManager.init(/* oncall */ false);
 
       sinon.assert.calledOnce(MockTonePlayer.init);
-      sinon.assert.calledWithExactly(MockTonePlayer.init, null);
+      sinon.assert.calledWithExactly(MockTonePlayer.init, 'notification');
     });
 
     test('sanitizePhoneNumber', function(done) {

diff --git a/apps/communications/manifest.webapp b/apps/communications/manifest.webapp
@@ -78,7 +78,7 @@
     "desktop-notification":{},
     "alarms": {},
     "systemXHR": {},
-    "audio-channel-content":{},
+    "audio-channel-notification":{},
     "idle":{},
     "storage": {},
     "device-storage:sdcard": { "access": "readcreate" },

diff --git a/shared/js/dialer/keypad.js b/shared/js/dialer/keypad.js
@@ -198,10 +198,7 @@ var KeypadManager = {
                                                 this.hangUpCallFromKeypad);
     }
 
-    /* XXX: We should be using the `notification' channel here but we can't due
-     * to bug 1092346 and pass `null' instead, forcing the use of the default
-     * audio channel. */
-    TonePlayer.init(this._onCall ? 'telephony' : null);
+    TonePlayer.init(this._onCall ? 'telephony' : 'notification');
 
     this.render();
     LazyLoader.load(['/shared/style/action_menu.css',

diff --git a/shared/js/dialer/tone_player.js b/shared/js/dialer/tone_player.js
@@ -82,12 +82,7 @@ var TonePlayer = {
       return;
     }
 
-    if (this._channel) {
-      this._audioContext = new AudioContext(this._channel);
-    } else {
-      // If no channel was specified stick with the default one.
-      this._audioContext = new AudioContext();
-    }
+    this._audioContext = new AudioContext(this._channel);
   },
 
   _trashAudio: function tp_trashAudio() {