Permalink
Browse files

Bug 807431 - [Phone] Final Ringtones Need to be Added to the Build

  • Loading branch information...
1 parent 42ac6c7 commit abf38de550b65c23a4c16219a3da882201ffd88e @vingtetun vingtetun committed Dec 6, 2012
Showing with 587 additions and 484 deletions.
  1. +0 −5 Android.mk
  2. +13 −26 Makefile
  3. +0 −1 apps/calendar/style/week_view.css
  4. +11 −8 apps/clock/index.html
  5. +4 −4 apps/clock/js/alarm.js
  6. +1 −1 apps/clock/js/onring.js
  7. +8 −0 apps/clock/locales/alarms.en-US.properties
  8. +0 −9 apps/clock/locales/clock.en-US.properties
  9. +1 −0 apps/clock/locales/locales.ini
  10. BIN apps/clock/style/ringtones/alarm_gem_echoes.ogg
  11. BIN apps/clock/style/ringtones/alarm_into_the_void.ogg
  12. BIN apps/clock/style/ringtones/alarm_ringing_strings.ogg
  13. BIN apps/clock/style/ringtones/alarm_shimmering_waves.ogg
  14. BIN apps/clock/style/ringtones/alarm_smooth_strings.ogg
  15. BIN apps/clock/style/ringtones/classic_buzz.ogg
  16. BIN apps/clock/style/ringtones/classic_pulse.ogg
  17. BIN apps/clock/style/ringtones/classic_pulse_progressive.ogg
  18. +6 −6 apps/communications/dialer/js/oncall.js
  19. BIN apps/communications/dialer/style/ringtones/classic.ogg
  20. BIN apps/communications/dialer/style/ringtones/low_bit.ogg
  21. BIN apps/communications/dialer/style/ringtones/old_school.ogg
  22. BIN apps/communications/dialer/style/ringtones/sms.wav
  23. +31 −44 apps/settings/index.html
  24. +2 −2 apps/settings/js/bluetooth.js
  25. +5 −5 apps/settings/js/onpair.js
  26. +161 −51 apps/settings/js/sound.js
  27. +4 −2 apps/settings/js/utils.js
  28. +2 −0 apps/settings/locales/locales.ini
  29. +12 −0 apps/settings/locales/notifications.en-US.properties
  30. +15 −0 apps/settings/locales/ringtones.en-US.properties
  31. +0 −4 apps/settings/locales/settings.en-US.properties
  32. BIN apps/settings/resources/ringtones/classic.ogg
  33. BIN apps/settings/resources/ringtones/low_bit.ogg
  34. BIN apps/settings/resources/ringtones/old_school.ogg
  35. BIN apps/settings/resources/ringtones/sms.wav
  36. +0 −1 apps/system/index.html
  37. +0 −11 apps/system/js/lockscreen.js
  38. +8 −1 apps/system/js/notifications.js
  39. +60 −64 apps/system/js/sound_manager.js
  40. +0 −15 apps/system/js/statusbar.js
  41. +0 −1 apps/system/js/window_manager.js
  42. BIN apps/system/style/notifications/ringtones/notification.wav
  43. +0 −179 apps/system/style/sound_manager/sound_manager.css
  44. BIN ...tyle/{sound_manager/images → themes/default/images/volume}/VolumeOverlay_Landscape_SegmentOff.png
  45. BIN ...{sound_manager/images → themes/default/images/volume}/VolumeOverlay_Landscape_SegmentOff_left.png
  46. BIN ...sound_manager/images → themes/default/images/volume}/VolumeOverlay_Landscape_SegmentOff_right.png
  47. BIN ...style/{sound_manager/images → themes/default/images/volume}/VolumeOverlay_Landscape_SegmentOn.png
  48. BIN .../{sound_manager/images → themes/default/images/volume}/VolumeOverlay_Landscape_SegmentOn_left.png
  49. BIN ...{sound_manager/images → themes/default/images/volume}/VolumeOverlay_Landscape_SegmentOn_right.png
  50. BIN apps/system/style/{sound_manager/images → themes/default/images/volume}/header_bg.png
  51. BIN apps/system/style/{sound_manager/images → themes/default/images/volume}/speaker_loud_icon.png
  52. BIN apps/system/style/{sound_manager/images → themes/default/images/volume}/speaker_mute_icon.png
  53. BIN apps/system/style/{sound_manager/images → themes/default/images/volume}/speaker_regular_icon.png
  54. BIN apps/system/style/{sound_manager/images → themes/default/images/volume}/vibration.png
  55. BIN apps/system/style/{sound_manager/images → themes/default/images/volume}/vibration_disabled_icon.png
  56. BIN apps/system/style/{sound_manager/images → themes/default/images/volume}/vibration_enabled_icon.png
  57. BIN apps/system/style/{sound_manager/images → themes/default/images/volume}/volume-off.png
  58. BIN apps/system/style/{sound_manager/images → themes/default/images/volume}/volume-on.png
  59. BIN apps/system/style/{sound_manager/images → themes/default/images/volume}/volume_center_active.png
  60. BIN apps/system/style/{sound_manager/images → themes/default/images/volume}/volume_center_disabled.png
  61. BIN apps/system/style/{sound_manager/images → themes/default/images/volume}/volume_left_active.png
  62. BIN apps/system/style/{sound_manager/images → themes/default/images/volume}/volume_left_disabled.png
  63. BIN apps/system/style/{sound_manager/images → themes/default/images/volume}/volume_right_active.png
  64. BIN apps/system/style/{sound_manager/images → themes/default/images/volume}/volume_right_disabled.png
  65. +145 −0 apps/system/style/themes/default/system.css
  66. +5 −1 build/preferences.js
  67. +26 −6 build/settings.py
  68. +20 −0 build/utils.js
  69. +1 −2 build/webapp-manifests.js
  70. +2 −23 build/webapp-zip.js
  71. +11 −11 shared/locales/tz/tz.en-US.properties
  72. BIN shared/resources/media/alarms/ac_classic_clock_alarm.opus
  73. BIN shared/resources/media/alarms/ac_classic_clock_alarm_prog.opus
  74. BIN shared/resources/media/alarms/ac_classic_clock_radio.opus
  75. BIN shared/resources/media/alarms/ac_normal_gem_echoes.opus
  76. BIN shared/resources/media/alarms/ac_normal_ringing_strings.opus
  77. BIN shared/resources/media/alarms/ac_soft_humming_waves.opus
  78. BIN shared/resources/media/alarms/ac_soft_into_the_void.opus
  79. BIN shared/resources/media/alarms/ac_soft_smooth_strings.opus
  80. +15 −0 shared/resources/media/notifications/list.json
  81. BIN shared/resources/media/notifications/notifier_bap.opus
  82. BIN shared/resources/media/notifications/notifier_bell.opus
  83. BIN shared/resources/media/notifications/notifier_bell_extd.opus
  84. BIN shared/resources/media/notifications/notifier_boomer.opus
  85. BIN shared/resources/media/notifications/notifier_bop.opus
  86. BIN shared/resources/media/notifications/notifier_dididi.opus
  87. BIN shared/resources/media/notifications/notifier_exclamation.ogg
  88. BIN shared/resources/media/notifications/notifier_minimal_bands.ogg
  89. BIN shared/resources/media/notifications/notifier_rewind.ogg
  90. BIN shared/resources/media/notifications/notifier_ring.ogg
  91. BIN shared/resources/media/notifications/notifier_spring.ogg
  92. BIN shared/resources/media/notifications/notifier_ting.opus
  93. +17 −0 shared/resources/media/ringtones/list.json
  94. BIN shared/resources/media/ringtones/ringer_bitbounce.opus
  95. BIN shared/resources/media/ringtones/ringer_classic_courier.opus
  96. BIN shared/resources/media/ringtones/ringer_classic_electric.ogg
  97. BIN shared/resources/media/ringtones/ringer_classic_prism.ogg
  98. BIN shared/resources/media/ringtones/ringer_classic_touchmatic.opus
  99. BIN shared/resources/media/ringtones/ringer_classic_wallphone.ogg
  100. BIN shared/resources/media/ringtones/ringer_digital_dapple.opus
  101. BIN shared/resources/media/ringtones/ringer_digitalascent.opus
  102. BIN shared/resources/media/ringtones/ringer_loude_windchimes.opus
  103. BIN shared/resources/media/ringtones/ringer_low_bit_swing.opus
  104. BIN shared/resources/media/ringtones/ringer_progressive_dapple.opus
  105. BIN shared/resources/media/ringtones/ringer_rain_echoes.opus
  106. BIN shared/resources/media/ringtones/ringer_ringing_gems.opus
  107. BIN shared/resources/media/ringtones/ringer_soft_disco_drive.opus
  108. BIN shared/resources/media/ringtones/ringer_vamos_la_elektro.opus
  109. +1 −1 shared/resources/tz.json
View
@@ -22,11 +22,6 @@ CLEAN_PROFILE := 0
# In user (production) builds we put gaia apps in /system/b2g/webapps
ifneq ($(filter user userdebug, $(TARGET_BUILD_VARIANT)),)
GAIA_MAKE_FLAGS += PRODUCTION=1
-B2G_SYSTEM_APPS := 1
-endif
-
-ifeq ($(B2G_SYSTEM_APPS),1)
-GAIA_MAKE_FLAGS += B2G_SYSTEM_APPS=1
GAIA_APP_INSTALL_PARENT := $(TARGET_OUT)/b2g
CLEAN_PROFILE := 1
endif
View
@@ -59,17 +59,13 @@ GAIA_DOMAIN=thisdomaindoesnotexist.org
GAIA_APP_SRCDIRS=apps showcase_apps
else ifeq ($(MAKECMDGOALS), production)
PRODUCTION=1
-B2G_SYSTEM_APPS=1
endif
# PRODUCTION is also set for user and userdebug B2G builds
ifeq ($(PRODUCTION), 1)
GAIA_APP_SRCDIRS=apps
-ADB_REMOUNT=1
-endif
-
-ifeq ($(B2G_SYSTEM_APPS), 1)
GAIA_INSTALL_PARENT=/system/b2g
+ADB_REMOUNT=1
endif
ifneq ($(GAIA_OUTOFTREE_APP_SRCDIRS),)
@@ -207,7 +203,7 @@ endif
endif
app-makefiles:
- for d in ${GAIA_APP_SRCDIRS}; \
+ @for d in ${GAIA_APP_SRCDIRS}; \
do \
for mfile in `find $$d -mindepth 2 -maxdepth 2 -name "Makefile"` ;\
do \
@@ -219,23 +215,19 @@ app-makefiles:
# We duplicate manifest.webapp to manifest.webapp and manifest.json
# to accommodate Gecko builds without bug 757613. Should be removed someday.
webapp-manifests: install-xulrunner-sdk
- @echo "Generated webapps"
@mkdir -p profile/webapps
@$(call run-js-command, webapp-manifests)
- @cat profile/webapps/webapps.json
- @echo "Done"
+ @#cat profile/webapps/webapps.json
# Generate profile/webapps/APP/application.zip
webapp-zip: stamp-commit-hash install-xulrunner-sdk
ifneq ($(DEBUG),1)
- @echo "Packaged webapps"
@rm -rf apps/system/camera
@cp -r apps/camera apps/system/camera
@cat apps/camera/index.html | sed -e 's:shared/:../shared/:' > apps/system/camera/index.html
@rm apps/system/camera/manifest.webapp
@mkdir -p profile/webapps
@$(call run-js-command, webapp-zip)
- @echo "Done"
endif
offline-cache: webapp-manifests install-xulrunner-sdk
@@ -329,33 +321,28 @@ EXTENDED_PREF_FILES = \
# Generate profile/prefs.js
preferences: install-xulrunner-sdk
- @echo "Generating prefs.js..."
- test -d profile || mkdir -p profile
+ @test -d profile || mkdir -p profile
@$(call run-js-command, preferences)
@$(foreach prefs_file,$(addprefix build/,$(EXTENDED_PREF_FILES)),\
if [ -f $(prefs_file) ]; then \
cat $(prefs_file) >> profile/user.js; \
fi; \
)
- @echo "Done"
# Generate profile/
applications-data: install-xulrunner-sdk
- @echo "Generating application data..."
test -d profile || mkdir -p profile
@$(call run-js-command, applications-data)
- @echo "Done. If this results in an error remove the xulrunner/xulrunner-sdk folder in your gaia folder."
# Generate profile/extensions
EXT_DIR=profile/extensions
extensions:
- @echo "Generating extensions..."
@mkdir -p profile
@rm -rf $(EXT_DIR)
ifeq ($(DEBUG),1)
cp -r tools/extensions $(EXT_DIR)
endif
- @echo "Done"
+ @echo "Finished: Generating extensions"
@@ -418,8 +405,8 @@ test-agent-config: test-agent-bootstrap-apps
@rm -f $(TEST_AGENT_CONFIG)
@touch $(TEST_AGENT_CONFIG)
@rm -f /tmp/test-agent-config;
- # Build json array of all test files
- for d in ${GAIA_APP_SRCDIRS}; \
+ @# Build json array of all test files
+ @for d in ${GAIA_APP_SRCDIRS}; \
do \
find $$d -name '*_test.js' | sed "s:$$d/::g" >> /tmp/test-agent-config; \
done;
@@ -429,19 +416,19 @@ test-agent-config: test-agent-bootstrap-apps
sed -e ':a' -e 'N' -e '$$!ba' -e 's/\n/,\
/g' >> $(TEST_AGENT_CONFIG);
@echo ' ]}' >> $(TEST_AGENT_CONFIG);
- @echo "Built test ui config file: $(TEST_AGENT_CONFIG)"
+ @echo "Finished: test ui config file: $(TEST_AGENT_CONFIG)"
@rm -f /tmp/test-agent-config
.PHONY: test-agent-bootstrap-apps
test-agent-bootstrap-apps:
- for d in `find -L ${GAIA_APP_SRCDIRS} -mindepth 1 -maxdepth 1 -type d` ;\
+ @for d in `find -L ${GAIA_APP_SRCDIRS} -mindepth 1 -maxdepth 1 -type d` ;\
do \
mkdir -p $$d/test/unit ; \
mkdir -p $$d/test/integration ; \
cp -f $(TEST_COMMON)/test/boilerplate/_proxy.html $$d/test/unit/_proxy.html; \
cp -f $(TEST_COMMON)/test/boilerplate/_sandbox.html $$d/test/unit/_sandbox.html; \
done
- @echo "Done bootstrapping test proxies/sandboxes";
+ @echo "Finished: bootstrapping test proxies/sandboxes";
# Temp make file method until we can switch
# over everything in test
@@ -502,7 +489,7 @@ lint:
# let us remove the update-offline-manifests target dependancy of the
# default target.
stamp-commit-hash:
- (if [ -d ./.git ]; then \
+ @(if [ -d ./.git ]; then \
git log -1 --format="%H%n%at" HEAD > apps/settings/resources/gaia_commit.txt; \
else \
echo 'Unknown Git commit; build date shown here.' > apps/settings/resources/gaia_commit.txt; \
@@ -511,7 +498,7 @@ stamp-commit-hash:
# Erase all the indexedDB databases on the phone, so apps have to rebuild them.
delete-databases:
- @echo 'Stoping b2g'
+ @echo 'Stopping b2g'
$(ADB) shell stop b2g
$(ADB) shell rm -r $(MSYS_FIX)/data/local/indexedDB/*
@echo 'Starting b2g'
@@ -562,7 +549,7 @@ update-offline-manifests:
TARGET_FOLDER = webapps/$(BUILD_APP_NAME).$(GAIA_DOMAIN)
install-gaia: profile
$(ADB) start-server
- @echo 'Stoping b2g'
+ @echo 'Stopping b2g'
$(ADB) shell stop b2g
$(ADB) shell rm -r $(MSYS_FIX)/cache/*
@@ -115,7 +115,6 @@
#week-view .week-events > ol li.event {
position: absolute;
width: 100%;
- z-index: 10;
}
#week-view .week-events > ol.hour-allday li.event {
View
@@ -11,6 +11,9 @@
<link rel="stylesheet" type="text/css" href="shared/style/headers.css">
<link rel="stylesheet" type="text/css" href="shared/style/switches.css">
+ <!-- Shared sounds -->
+ <link rel="resources" type="directory" href="shared/resources/media/alarms/">
+
<!-- Localization -->
<link rel="resource" type="application/l10n" href="/shared/locales/date.ini">
<link rel="resource" type="application/l10n" href="locales/locales.ini">
@@ -193,14 +196,14 @@ <h1 id="alarm-title"></h1>
<li class="singleline">
<span class="view-alarm-lbl" data-l10n-id="sound">Sound</span>
<select id="sound-select" class="abstract-menu">
- <option value="classic_buzz.ogg" data-l10n-id="classic_buzz">Classic Buzz</option>
- <option value="classic_pulse.ogg" data-l10n-id="classic_pulse">Classic Pulse</option>
- <option value="classic_pulse_progressive.ogg" data-l10n-id="classic_pulse_progressive">Classic Progressive</option>
- <option value="alarm_gem_echoes.ogg" data-l10n-id="alarm_gem_echoes">Gem Echoes</option>
- <option value="alarm_into_the_void.ogg" data-l10n-id="alarm_into_the_void">Into the Void</option>
- <option value="alarm_ringing_strings.ogg" data-l10n-id="alarm_ringing_strings">Ringing Strings</option>
- <option value="alarm_shimmering_waves.ogg" data-l10n-id="alarm_shimmering_waves">Shimmering Waves</option>
- <option value="alarm_smooth_strings.ogg" data-l10n-id="alarm_smooth_strings">Smooth Strings</option>
+ <option value="ac_classic_clock_alarm.opus" data-l10n-id="ac_classic_clock_alarm_opus"></option>
+ <option value="ac_classic_clock_alarm_prog.opus" data-l10n-id="ac_classic_clock_alarm_prog_opus"></option>
+ <option value="ac_classic_clock_radio.opus" data-l10n-id="ac_classic_clock_radio_opus"></option>
+ <option value="ac_normal_gem_echoes.opus" data-l10n-id="ac_normal_gem_echoes_opus"></option>
+ <option value="ac_normal_ringing_strings.opus" data-l10n-id="ac_normal_ringing_strings_opus"></option>
+ <option value="ac_soft_humming_waves.opus" data-l10n-id="ac_soft_humming_waves_opus"></option>
+ <option value="ac_soft_into_the_void.opus" data-l10n-id="ac_soft_into_the_void_opus"></option>
+ <option value="ac_soft_smooth_strings.opus" data-l10n-id="ac_soft_smooth_strings_opus"></option>
</select>
<a id="sound-menu" class="abstract-menu">Classic</a>
<p></p>
View
@@ -789,7 +789,7 @@ var AlarmEditView = {
minute: now.getMinutes(), // use current minute
enabled: true,
repeat: '0000000',
- sound: 'classic_buzz.ogg',
+ sound: 'ac_classic_clock_alarm.opus',
snooze: 5,
color: 'Darkorange'
};
@@ -863,9 +863,9 @@ var AlarmEditView = {
},
refreshSoundMenu: function aev_refreshSoundMenu(sound) {
- // Refresh and paser the name of sound file for sound menu.
+ // Refresh and parse the name of sound file for sound menu.
var sound = (sound) ? this.getSoundSelect() : this.alarm.sound;
- this.soundMenu.innerHTML = _(sound.slice(0, sound.lastIndexOf('.')));
+ this.soundMenu.innerHTML = _(sound.replace('.', '_'));
},
previewSound: function aev_previewSound() {
@@ -878,7 +878,7 @@ var AlarmEditView = {
}
var ringtoneName = this.getSoundSelect();
- var previewRingtone = 'style/ringtones/' + ringtoneName;
+ var previewRingtone = 'shared/resources/media/alarms/' + ringtoneName;
ringtonePlayer.mozAudioChannelType = 'alarm';
ringtonePlayer.src = previewRingtone;
ringtonePlayer.play();
View
@@ -81,7 +81,7 @@ var RingView = {
var ringtonePlayer = this._ringtonePlayer;
ringtonePlayer.mozAudioChannelType = 'alarm';
ringtonePlayer.loop = true;
- var selectedAlarmSound = 'style/ringtones/' +
+ var selectedAlarmSound = 'shared/ringtones/media/alarms/' +
window.opener.AlarmManager.getAlarmSound();
ringtonePlayer.src = selectedAlarmSound;
ringtonePlayer.play();
@@ -0,0 +1,8 @@
+ac_classic_clock_alarm_opus = Classic Buzz
+ac_classic_clock_alarm_prog_opus = Classic Pulse Progressive
+ac_classic_clock_radio_opus = Classic Pulse
+ac_normal_gem_echoes_opus = Gem Echoes
+ac_soft_smooth_strings_opus = Smooth Strings
+ac_soft_humming_waves_opus = Shimmering Waves
+ac_normal_ringing_strings_opus = Ringing Strings
+ac_soft_into_the_void_opus = Into the Void
@@ -59,12 +59,3 @@ nRemainMinutes[two] = and <strong>{{n}} minutes</strong>
nRemainMinutes[few] = and <strong>{{n}} minutes</strong>
nRemainMinutes[many] = and <strong>{{n}} minutes</strong>
nRemainMinutes[other] = and <strong>{{n}} minutes</strong>
-
-classic_buzz = Classic Buzz
-classic_pulse = Classic Pulse
-classic_pulse_progressive = Classic Progressive
-alarm_gem_echoes = Gem Echoes
-alarm_into_the_void = Into the Void
-alarm_ringing_strings = Ringing Strings
-alarm_shimmering_waves = Shimmering Waves
-alarm_smooth_strings = Smooth Strings
@@ -1,4 +1,5 @@
@import url(clock.en-US.properties)
+@import url(alarms.en-US.properties)
[ar]
@import url(clock.ar.properties)
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -166,15 +166,15 @@ var OnCallHandler = (function onCallHandler() {
/* === Settings === */
var activePhoneSound = true;
- SettingsListener.observe('audio.volume.notification', true, function(value) {
+ SettingsListener.observe('ring.enabled', true, function(value) {
activePhoneSound = !!value;
});
- var selectedPhoneSound = 'style/ringtones/classic.ogg';
- SettingsListener.observe('dialer.ringtone', 'classic.ogg', function(value) {
- selectedPhoneSound = 'style/ringtones/' + value;
+ var selectedPhoneSound = '';
+ SettingsListener.observe('dialer.ringtone', '', function(value) {
+ selectedPhoneSound = value;
ringtonePlayer.pause();
- ringtonePlayer.src = selectedPhoneSound;
+ ringtonePlayer.src = value;
if (ringing) {
ringtonePlayer.play();
@@ -322,7 +322,7 @@ var OnCallHandler = (function onCallHandler() {
}, 600);
}
- if (activePhoneSound && selectedPhoneSound) {
+ if (activePhoneSound) {
ringtonePlayer.play();
ringing = true;
}
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Oops, something went wrong.

0 comments on commit abf38de

Please sign in to comment.