Revert #6140 for making builds too fat.

This reverts commit 1998c27.

apps/communications/dialer/js/oncall.js

@@ -168,8 +168,8 @@ var OnCallHandler = (function onCallHandler() {
     activePhoneSound = !!value;
   });
 
-  var selectedPhoneSound = 'style/ringtones/ringer_classic_courier.ogg';
-  SettingsListener.observe('dialer.ringtone', 'ringer_classic_courier.ogg', function(value) {
+  var selectedPhoneSound = 'style/ringtones/classic.ogg';
+  SettingsListener.observe('dialer.ringtone', 'classic.ogg', function(value) {
     selectedPhoneSound = 'style/ringtones/' + value;
     ringtonePlayer.pause();
     ringtonePlayer.src = selectedPhoneSound;

apps/settings/index.html

@@ -692,108 +692,24 @@ <h2 data-l10n-id="ring-tones">Ringtones</h2>
       <ul>
         <li>
           <label onmouseup="audioPreview(this)">
-            <input type="radio" name="tone-option" data-ignore value="ringer_classic_courier.ogg" data-label="Classic Courier" checked />
+            <input type="radio" name="tone-option" data-ignore value="classic.ogg" data-label="Classic" checked />
             <span></span>
           </label>
-          <a data-l10n-id="ringer_classic_courier">Classic Courier</a>
+          <a data-l10n-id="classic">Classic</a>
         </li>
         <li>
           <label onmouseup="audioPreview(this)">
-            <input type="radio" name="tone-option" data-ignore value="ringer_classic_electric.ogg" data-label="Classic Electric" checked />
+            <input type="radio" name="tone-option" data-ignore value="old_school.ogg" data-label="Old School" />
             <span></span>
           </label>
-          <a data-l10n-id="ringer_classic_electric">Classic Electric</a>
-        </li>
-         <li>
-          <label onmouseup="audioPreview(this)">
-            <input type="radio" name="tone-option" data-ignore value="ringer_classic_prism.ogg" data-label="Classic Prism" checked />
-            <span></span>
-          </label>
-          <a data-l10n-id="ringer_classic_prism">Classic Prism</a>
-        </li>
-         <li>
-          <label onmouseup="audioPreview(this)">
-            <input type="radio" name="tone-option" data-ignore value="ringer_classic_touchmatic.ogg" data-label="Classic Touchmatic" checked />
-            <span></span>
-          </label>
-          <a data-l10n-id="ringer_classic_touchmatic">Classic Touchmatic</a>
-        </li>
-         <li>
-          <label onmouseup="audioPreview(this)">
-            <input type="radio" name="tone-option" data-ignore value="ringer_classic_wallphone.ogg" data-label="Classic Wall Phone" checked />
-            <span></span>
-          </label>
-          <a data-l10n-id="ringer_classic_wallphone">Classic Wall Phone</a>
-        </li>
-        <li>
-          <label onmouseup="audioPreview(this)">
-            <input type="radio" name="tone-option" data-ignore value="ringer_analog_dapple.ogg" data-label="Analog Dapple" checked />
-            <span></span>
-          </label>
-          <a data-l10n-id="ringer_analog_dapple">Analog Dapple</a>
-        </li>
-        <li>
-          <label onmouseup="audioPreview(this)">
-            <input type="radio" name="tone-option" data-ignore value="ringer_bitbounce.ogg" data-label="Bit Bounce" checked />
-            <span></span>
-          </label>
-          <a data-l10n-id="ringer_bitbounce">Bit Bounce</a>
-        </li>
-        <li>
-          <label onmouseup="audioPreview(this)">
-            <input type="radio" name="tone-option" data-ignore value="ringer_digital_ascent.ogg" data-label="Digital Ascent" checked />
-            <span></span>
-          </label>
-          <a data-l10n-id="ringer_digital_ascent">Digital Ascent</a>
-        </li>
-         <li>
-          <label onmouseup="audioPreview(this)">
-            <input type="radio" name="tone-option" data-ignore value="ringer_disco_drive.ogg" data-label="Disco Drive" checked />
-            <span></span>
-          </label>
-          <a data-l10n-id="ringer_disco_drive">Disco Drive</a>
-        </li>
-        <li>
-          <label onmouseup="audioPreview(this)">
-            <input type="radio" name="tone-option" data-ignore value="ringer_low_bit_swing.ogg" data-label="Low Bit Swing" checked />
-            <span></span>
-          </label>
-          <a data-l10n-id="ringer_low_bit_swing">Low Bit Swing</a>
-        </li>
-        <li>
-          <label onmouseup="audioPreview(this)">
-            <input type="radio" name="tone-option" data-ignore value="ringer_progressive_dapple.ogg" data-label="Progressive Dapple" checked />
-            <span></span>
-          </label>
-          <a data-l10n-id="ringer_progressive_dapple">Progressive Dapple</a>
-        </li>
-        <li>
-          <label onmouseup="audioPreview(this)">
-            <input type="radio" name="tone-option" data-ignore value="ringer_rain_echoes.ogg" data-label="Rain Echoes" checked />
-            <span></span>
-          </label>
-          <a data-l10n-id="ringer_rain_echoes">Rain Echoes</a>
+          <a data-l10n-id="oldSchool">Old School</a>
         </li>
         <li>
           <label onmouseup="audioPreview(this)">
-            <input type="radio" name="tone-option" data-ignore value="ringer_ringing_gems.ogg" data-label="Ringing Gems" checked />
+            <input type="radio" name="tone-option" data-ignore value="low_bit.ogg" data-label="Low Bit" />
             <span></span>
           </label>
-          <a data-l10n-id="ringer_ringing_gems">Ringing Gems</a>
-        </li>
-        <li>
-          <label onmouseup="audioPreview(this)">
-            <input type="radio" name="tone-option" data-ignore value="ringer_vamos_la_elektro.ogg" data-label="Vamos Là Elektro" checked />
-            <span></span>
-          </label>
-          <a data-l10n-id="ringer_vamos_la_elektro">Vamos Là Elektro</a>
-        </li>
-        <li>
-          <label onmouseup="audioPreview(this)">
-            <input type="radio" name="tone-option" data-ignore value="ringer_windchimes.ogg" data-label="Wind Chimes" checked />
-            <span></span>
-          </label>
-          <a data-l10n-id="ringer_windchimes">Wind Chimes</a>
+          <a data-l10n-id="lowBit">Low Bit</a>
         </li>
       </ul>
 
@@ -803,64 +719,15 @@ <h2 data-l10n-id="alert-tones">Alert Tones</h2>
       <ul>
         <li>
           <label onmouseup="audioPreview(this)">
-            <input type="radio" name="tone-option" data-ignore value="notifier_blip.ogg" data-label="Blip" />
-            <span></span>
-          </label>
-          <a data-l10n-id="blip">Blip</a>
-        </li>
-        <li>
-          <label onmouseup="audioPreview(this)">
-            <input type="radio" name="tone-option" data-ignore value="notifier_boomer.ogg" data-label="Boomer" />
-            <span></span>
-          </label>
-          <a data-l10n-id="boomer">Boomer</a>
-        </li>
-        <li>
-          <label onmouseup="audioPreview(this)">
-            <input type="radio" name="tone-option" data-ignore value="notifier_bop.ogg" data-label="Bop" />
-            <span></span>
-          </label>
-          <a data-l10n-id="bop">Bop</a>
-        </li>
-        <li>
-          <label onmouseup="audioPreview(this)">
-            <input type="radio" name="tone-option" data-ignore value="notifier_dididi.ogg" data-label="Di Di Di" />
-            <span></span>
-          </label>
-          <a data-l10n-id="dididi">Di Di Di</a>
-        </li>
-        <li>
-          <label onmouseup="audioPreview(this)">
-            <input type="radio" name="tone-option" data-ignore value="notifier_minimal_bands.ogg" data-label="Minimal Bands" />
-            <span></span>
-          </label>
-          <a data-l10n-id="minimal_bands">Minimal Bands</a>
-        </li>
-        <li>
-          <label onmouseup="audioPreview(this)">
-            <input type="radio" name="tone-option" data-ignore value="notifier_rewind.ogg" data-label="Rewind" />
-            <span></span>
-          </label>
-          <a data-l10n-id="rewind">Rewind</a>
-        </li>
-        <li>
-          <label onmouseup="audioPreview(this)">
-            <input type="radio" name="tone-option" data-ignore value="notifier_exclamation.ogg" data-label="Exclamation" />
-            <span></span>
-          </label>
-          <a data-l10n-id="exclamation">Exclamation</a>
-        </li>
-        <li>
-          <label onmouseup="audioPreview(this)">
-            <input type="radio" name="tone-option" data-ignore value="notifier_tingy.ogg" data-label="Tingy" />
+            <input type="radio" name="tone-option" data-ignore value="sms.wav" data-label="Beep Beep" />
             <span></span>
           </label>
-          <a data-l10n-id="tingy">Tingy</a>
+          <a data-l10n-id="beep">Beep Beep</a>
         </li>
       </ul>
 
       <!-- Audio Preview -->
-      <audio style="display: none;" src="style/ringtones/ringer_classic_courier.ogg"></audio>
+      <audio style="display: none;" src="style/ringtones/classic.ogg"></audio>
     </section>
 
     <!-- Personalization :: Sound -->
@@ -901,12 +768,13 @@ <h2 data-l10n-id="volume-and-tones">Volume and Tones</h2>
         </li>
         <li>
           <span data-l10n-id="call">Call
-            <button id="call-tone-selection" class="tone-select">Classic Courier</button>
+            <button id="call-tone-selection" class="tone-select">Old School</button>
           </span>
         </li>
         <li>
           <span data-l10n-id="message">Message
-            <button id="sms-tone-selection" class="tone-select">Exclamation</button>
+            <button id="sms-tone-selection" class="tone-select">
+              Beep Beep</button>
           </span>
         </li>
       </ul>

apps/settings/js/sound.js

@@ -28,12 +28,12 @@ var SoundSettings = {
     var lock = window.navigator.mozSettings.createLock();
     var req = lock.get(this.callSettings.key);
     req.onsuccess = function ss_getDialerTone() {
-      self.callSettings.value = req.result['dialer.ringtone'] || 'ringer_classic_courier.ogg';
+      self.callSettings.value = req.result['dialer.ringtone'] || 'classic.ogg';
       self.updateButton(self.callSettings);
     };
     var req2 = lock.get(this.smsSettings.key);
     req2.onsuccess = function ss_getSmsTone() {
-      self.smsSettings.value = req2.result['sms.ringtone'] || 'notifier_exclamation.ogg';
+      self.smsSettings.value = req2.result['sms.ringtone'] || 'sms.wav';
       self.updateButton(self.smsSettings);
     };
   },

apps/sms/style/ringtones/README

@@ -0,0 +1,20 @@
+OPENMOKO SOUNDS by Marek "Wansti" Möckel
+
+License:
+
+	Unless a different license type is required for OpenMoko all files
+	are released under the CreativeCommons Attribution-ShareAlike 3.0
+	license.
+
+Tools I used:
+
+	All tunes have been composed in Rosegarden (an OpenSource MIDI
+	sequencer available at www.rosegardenmusic.com), rendered on a
+	Yamaha Motif ES tone generator and recorded using Audacity or
+	Ardour.
+	If you would like to modify the tunes, please keep in mind that
+	rendering the .rg files on a different tone generator will most
+	likely produce very different (maybe better :-P) results. MIDI
+	files are available on request, or can be created using Rosegarden's
+	export function.
+