Merge pull request #10391 from samjoch/bug-883090-SoundsRemoveStartup…

…ShutdownSounds

Bug 883090 - [Sounds] Remove startup shutdown sounds and controls, r=@timdream

apps/settings/index.html

@@ -1310,13 +1310,6 @@ <h2 data-l10n-id="other-sounds">Other Sounds</h2>
             </label>
             <a data-l10n-id="unlock-screen">Unlock Screen</a>
           </li>
-          <li>
-            <label>
-              <input type="checkbox" name="bootshutdown.sound.enabled" checked />
-              <span></span>
-            </label>
-            <a data-l10n-id="boot-and-shutdown">Boot and Shutdown</a>
-          </li>
         </ul>
       </div>
 

apps/settings/locales/settings.en-US.properties

@@ -266,7 +266,6 @@ alert-tones=Alert tones
 volume-and-tones=Volume & Tones
 other-sounds=Other sounds
 alerts=Alerts
-boot-and-shutdown=Boot and Shutdown
 unlock-screen=Unlock screen
 camera-shutter=Camera shutter
 sent-mail=Sent Mail

apps/system/index.html

@@ -227,9 +227,6 @@
     <script defer src="js/window.js"></script>
     <script defer src="js/window_manager.js"></script>
 
-    <!-- Boot sound  -->
-    <script defer src="js/boot_sound.js"></script>
-
     <!-- Entry Sheet -->
     <link rel="stylesheet" type="text/css" href="style/entry_sheet/entry_sheet.css">
     <script defer src="js/entry_sheet.js"></script>

apps/system/js/sleep_menu.js

@@ -10,9 +10,6 @@ var SleepMenu = {
   // Indicate setting status of volume
   isSilentModeEnabled: false,
 
-  // Indicate setting status of bootshutdown.sound.enabled
-  shouldPlayShutdownSound: false,
-
   elements: {},
 
   get visible() {
@@ -44,11 +41,6 @@ var SleepMenu = {
     SettingsListener.observe('audio.volume.notification', 7, function(value) {
       self.isSilentModeEnabled = (value == 0);
     });
-
-    SettingsListener.observe('bootshutdown.sound.enabled', true,
-      function(value) {
-        self.shouldPlayShutdownSound = value;
-      });
   },
 
   // Generate items
@@ -288,13 +280,8 @@ var SleepMenu = {
       div.className = 'step1';
       var nextAnimation = function nextAnimation(e) {
         // Switch to next class
-        if (e.target == div) {
+        if (e.target == div)
           div.className = 'step2';
-          if (self.shouldPlayShutdownSound) {
-            var shutdownSound = new Audio('./resources/sounds/shutdown.ogg');
-            shutdownSound.play();
-          }
-        }
 
         if (e.target != inner)
           return;

build/settings.py

@@ -26,7 +26,6 @@
  "bluetooth.enabled": False,
  "bluetooth.debugging.enabled": False,
  "bluetooth.suspended": False,
- "bootshutdown.sound.enabled": False,
  "camera.shutter.enabled": True,
  "clear.remote-windows.data": False,
  "debug.console.enabled": False,