135 Commits

Author SHA1 Message Date
TreeHugger Robot
fa717b9f9e Merge "Add Effect_Tick.ogg back to Android TV devices" into rvc-dev am: a12b964839
Change-Id: Id36a4f786aa02c335ca20fd2f035fe02584cca02
2020-05-27 19:55:27 +00:00
Robin Lee
3bf241ba1c Add Effect_Tick.ogg back to Android TV devices
Change-Id: I61039a9f3bae072cbf059c784b579ca3aa7f77be
Test: adb shell input keyevent DPAD_RIGHT
Test: ls $OUT/product/media/audio/ui
Bug: 157310189
Bug: 132316308
2020-05-27 18:14:35 +00:00
Beverly
f0ce4f1451 Update ChargingStarted sound
Test: manual
Bug: 154293919
Change-Id: If14fad6189e4d216c892325e23d8607b2a0f3727
2020-04-22 18:21:18 +00:00
Greg Kaiser
6074b2592e Add some sounds used by KeyguardViewMediator
Logcat failures indicate these three sounds are used in Android Go
builds.

Bug: 145923544
Test: Boot wembley and no longer see error in logcat about these files.
Change-Id: I3ee3248125d4f08a5ad71d1936a88484a8964fa2
2019-12-09 12:28:00 -08:00
Jean-Michel Trivi
0fb6ac46d9 Merge "AudioPackage11.mk: fix typo" am: 2f7b351010 am: 15b30f03f4
am: 8367ff5263

Change-Id: Ib6e954140ef689c561ec2f2429c1944833dd15c3
2019-11-14 10:48:42 -08:00
Jean-Michel Trivi
76c707467d AudioPackage11.mk: fix typo
Fix typo after file name introduced
by dc54082abe08aacbb67db6ca3e02aaa582198274

Bug: 144470640
Test: add frameworks/base/data/sounds/AudioPackage11.mk in product mk and build
Change-Id: I75101b12596b2b50d8017325f55cd85ea836f6a8
2019-11-14 08:36:10 -08:00
Andreea
1ab0502d37 Add default alarm tone.
Alarms were removed previously to reduce the space required for the
system image. But we still need a default one for the RingtoneManager
tests.

Bug: 110449143
Test: cts -m CtsMediaTestCases -t android.media.cts.RingtoneManagerTest#testSetType
Change-Id: Iee91156059f3440fbb6a0b28765dd3bb0b997cf5
(cherry picked from commit ecf1bfc3e4109d6f43b3fe4d27bc8035fbd462d8)
2019-06-27 14:12:29 -07:00
Anton Hansson
b8f6d0d5bf Move default sounds to /product
The set of audio files is frequently customized, so move the default
set to /product. The frameworks scans both of these directories.

Bug: 80410283
Bug: 118826166
Test: verify sounds available in soundpicker
Change-Id: I3bfc71b46eb64b4d4614b62c65fb8821bf1c271a
2019-01-07 14:16:56 +00:00
Anton Hansson
5113c0cf17 Move default sounds to /product
The set of audio files is frequently customized, so move the default
set to /product. The frameworks scans both of these directories.

Bug: 80410283
Bug: 118826166
Test: verify sounds available in soundpicker
Change-Id: I3bfc71b46eb64b4d4614b62c65fb8821bf1c271a
Merged-In: I3bfc71b46eb64b4d4614b62c65fb8821bf1c271a
2019-01-07 14:16:52 +00:00
Jean-Michel Trivi
8df8455384 Merge "Audio assets: add NFC sounds"
am: 5cb7cd68a0

Change-Id: I84755ad470a4826879cd6c148c9a041bce6a7920
2018-07-12 14:36:35 -07:00
Jean-Michel Trivi
72a7c401bd Audio assets: add NFC sounds
Add audio assets for NFC events.
Add new audio package that includes the NFC sounds in the UI "sound
   effects"

Bug: 80405985
Test: use AudioPackage14 in device build, verify NFC sounds are under system/media/audio/ui
Change-Id: Ifdb79286ad4ba083a5515402f8d3e62e0ba61c3f
2018-07-10 17:34:42 -07:00
Beverly
cad356a9d0 Merge changes from topic "audio-package-update"
am: 2d5156733c

Change-Id: I051fc7af9663a90ff5b7e080dd44001646d35089
2018-06-08 17:11:41 -07:00
Beverly
610e0c4820 Include InCallNotification.ogg in AllAudio.mk file
Test: manual
Change-Id: Ic7dee1ece7231731a6fdab5aa7057ff240b94071
2018-06-07 22:46:18 +00:00
Beverly
3de6c5ecbf Add ChargingStarted + InCallNotif to AudioPackage
Add the ChargingStarted and InCallNotification sounds
to AudioPackages to make them available to AOSP

Test: manual
Change-Id: I614bd69471ef19f6095f7d7874acbb85ff56d99c
2018-06-07 20:35:58 +00:00
Kristian Monsen
a3c544195e Remove most sounds
TV system image has a lot of unused alarms and notifications that can
be removed.

Bug: 74444644
Test: Flash device and still works, used a test app to play default sounds
Change-Id: Ifd70aed418e328cee653948ee0584293aaa7702
2018-05-16 14:07:14 +02:00
Ng Zhi An
3b4f22178a Add default alarm back into AudioPackage
Bug: 70788062
Test: open alarm clock and see default alarm
Change-Id: Ic2ca2638015e4bc114461c3b8b0f4fe7dd07c666
2017-12-21 17:02:02 -08:00
Daniel Cardenas
8ad428a94b Revert "Revert "Create new Audio include for TVs that doesn't have ringtones.""
This saves 5944K or almost 6MB on system partition.
Bug: 65572669
Test: build

This reverts commit 9deba686fa77696cff1e0bfed22080950cd86a1e.
2017-09-12 17:12:08 -07:00
Narayan Kamath
94d0d0db31 AudioPackageGo: Add misc. other sounds required by the system.
Bug: 65204114
Test: make
Change-Id: I7a6b7ec18716c912a5ace9b448c3db0b8c34b167
2017-09-11 15:20:42 +01:00
Narayan Kamath
cb6dff8181 sounds : Add a makefile for Android Go specific sounds.
Bug: 64276740
Bug: 64542579
Test: make

Change-Id: I64e0bc8d4db5fafe0370977ccc8eb1c711aa5534
2017-08-23 19:37:42 +01:00
Beverly
5d463b6c88 Pleasant sound implemented for in-call notif.
Replacing tone generator with an audio file for in-call notifications from text messages.

Fixes: 38194285
Test: runtest -x frameworks/base/services/tests/notification/src/com/android/server/notification/BuzzBeepBlinkTest.java
Change-Id: I9ec28ff54ae259ae906b3db08ece7059707c7edb
2017-08-10 21:27:20 +00:00
Daniel Cardenas
9deba686fa Revert "Create new Audio include for TVs that doesn't have ringtones."
There is currently 37 megabytes free.  Ringtones take about 3 megabytes.
Future assistant may add call in, in future.

Bug: 36066803
Test: build

This reverts commit 8ac32ec6580c11a853862ebabd20f3cacb8e6cf7.

Change-Id: I44a2fabb613f46fa7834eced42bcb90c21948cff
2017-05-31 18:43:30 +00:00
Daniel Cardenas
8ac32ec658 Create new Audio include for TVs that doesn't have ringtones.
Copied AllAudio.mk, pseudo sorted the list and removed ringtones.

Bug: 36066803
Test: Build on Fugu
Change-Id: I5a68dc930fae9e694a62a023f7445c752487c492
2017-03-09 13:40:16 -08:00
Jean-Michel Trivi
bcbb5c4e07 Fix alarm Bounce: remove DC offset at beginning
Bug 31047718

Change-Id: I8abc8c6d90be172fe2797b1e89d34fafa690e21c
2016-08-24 23:02:49 +00:00
Jean-Michel Trivi
81c909760a Additional alarm sounds for N
All file have "ANDROID_LOOP=true" and "TITLE" set.

Bug 27880181

Change-Id: Ia2289b53f6b928e0d49a49281ff96cc5690863e5
2016-04-27 14:47:33 -07:00
Chien-Yu Chen
912eb8341b Add and copy video stop sound
The newly added video stop sounds are the same as video start
sounds.

Bug: 25652382
Change-Id: I1edbacd7e7b8edc5ad509b979000b4f81d81931d
2015-11-20 14:01:47 -08:00
Jason Monk
3240988105 Add material camera_click sound
Bug: 17281234
Change-Id: I3f9a7592cfe8171fcae44ea075bf7faafaa482fe
2014-09-18 12:46:10 -04:00
Dan Sandler
f56a345482 Update soundscape for L, using classic names.
(partial revert of commit 7348f744)

Bug: 15725449
Change-Id: Ic1a038c906deab035f96caed42fc16c59d459965
2014-08-28 00:40:26 -04:00
Adrian Roos
93b18bda1b Update soundscape for L
Bug: 15725449
Change-Id: I8c1033b24a50a61185d042bd6d214d7a3407ccbe
2014-08-26 04:24:31 +00:00
Adrian Roos
49e057d7ee Play "device trusted" sound when onTrustInitiatedByUser fires
Bug: 16840500
Change-Id: I73fbe5c2cff665ccb637abb9039d57f377d9df53
2014-08-18 16:53:27 +00:00
Glenn Kasten
2a4768c735 KeypressInvalid_48k.ogg was 44.1 kHz previously
Command:
oggenc --resample 48000 -o ogg/KeypressInvalid_48k.ogg KeypressInvalid.wav

Change-Id: I862ba47f41eee8b6668cd45b9322f164fd652a7f
2013-11-19 16:40:06 -08:00
Glenn Kasten
34262cdfc5 Replace keyboard sounds with latest (softer) design
Make AudioPackage8 (N7 v1) and AudioPackage9 (N10) more like
AudioPackage12_48 (N5).

Bug: 11158758
Change-Id: I55052218f62159fd90efb21be19e19509eb11afe
2013-11-13 09:17:46 -08:00
Glenn Kasten
8a0d133cd7 Merge "Make AudioPackage11 (N7 v2) more like AudioPackage12_48 (N5)" into klp-dev 2013-11-12 18:40:42 +00:00
Jean-Michel Trivi
0623a1bc76 Fix Tethys asset
When played on a device with MBDRC or on headphones, flaws in this
 asset become apparent: hiss throughout the sound, and positive
 true-peak on the first attack on the right channel.
This new version has reduced noise through substraction of the
 noise print at the end, and fadeout to silence. The asset is
 encoded with a 3dB headroom and a slight EQ.

Bug 11077919

Change-Id: I73ab91ca7118afd382e15a4673c332353294470e
2013-11-08 17:41:35 -08:00
Glenn Kasten
2f6965c2a4 Make AudioPackage11 (N7 v2) more like AudioPackage12_48 (N5)
Replace keyboard and lock sounds with latest (softer) design.
Bug: 11158758

Change-Id: Ib02a0cbdecaaf7618f8806f84bc896912821b5f4
2013-11-08 09:34:16 -08:00
Glenn Kasten
14aa1ed0f4 Make AudioPackage10 (N4) more like AudioPackage12_48 (N5)
Replace keyboard and lock sounds with latest (softer) design.

Bug: 11158758
Change-Id: Ic40d53207be8b23fdafb3ac0c0852744950c79ec
2013-11-08 00:36:20 +00:00
Daniel Sandler
4e6f752f23 Put soundpooled sounds in the right place.
Bug: 10846839
Change-Id: I5318c2d54ea0e25fa74bbafc35fb4f7a2883b351
2013-09-20 00:27:01 -04:00
Daniel Sandler
dcbdd3b420 New sounds for K.
AudioPackage12 uses the new sounds (specifically the default
versions at 44.1kHz); device-specific makefiles can elect to
use the 48k versions instead by including
AudioPackage12_48.mk.

Bug: 9454760
Change-Id: If714fc4b98f6700163f08c92a6376f28f9616382
2013-09-18 23:09:58 -04:00
Justin Koh
0dc6733e3f Add keypress invalid to all AudioPackage mk files.
Add keypress invalid to all AudioPackage mk files.
Bug: 10571332

Change-Id: I3999b124a97869da567200d3588087a9fdc1b8d8
2013-09-03 12:58:43 -07:00
Jean-Michel Trivi
f40a0535ac am a8f7659a: am f65c9189: am bbc9a62a: Cleaner Tejat notification in Audio Package 11
* commit 'a8f7659aba2c9233fb61ae34dfc0d7477dc0ae91':
  Cleaner Tejat notification in Audio Package 11
2013-07-19 13:42:39 -07:00
Justin Koh
cacfe69b68 Add FX_KEYPRESS_INVALID constant to AudioManager.
Add FX_KEYPRESS_INVALID constant to AudioManager. This is a sound which should
play if the user tries to click or press on an element which is disabled.

Change-Id: Idd8953abeddd1afb51f7f190f9fb612ef672defa
2013-07-18 10:46:19 -07:00
Jean-Michel Trivi
bbc9a62a71 Cleaner Tejat notification in Audio Package 11
Add a reworked version of "Tejat", at 48kHz.
 The original asset is "/data/sounds//notifications/wav/Deneb.wav".
Use this new version in Audio Package 11 under its original name.

Bug 9900161

Change-Id: I4d7c73715db4e52f5c89aeca726f8b314e0895d5
2013-07-17 15:38:57 -07:00
Dave Burke
fbdb7d25de Fix up device sounds.
Bug: 9179812
Change-Id: Ie86287487830c06f38bcc5c0e8bab3da225d6bbf
2013-05-28 21:44:29 -07:00
Jean-Baptiste Queru
9ce89835da Update list of all audio files.
This adds a script that can generate the list from the other
makefiles.

This also regenerates the list.

Bug: 6336895
Change-Id: If1546c4a3f5b1f0d7c3ca79d29383e9843b2a89d
2013-04-03 15:36:52 -07:00
Glenn Kasten
d35d3687c7 Merge "Turn off execute bit for ordinary media files" 2012-12-17 12:12:40 -08:00
Jeff Brown
ace7404de8 resolved conflicts for merge of d7337fb9 to master
Change-Id: I51dedcc5ee521e62ad6101c0b09e4f881b8c4bf0
2012-12-11 15:21:02 -08:00
Jeff Brown
d7337fb97a am 3781523b: am eaae7d97: Merge "Play a tone when wireless charging begins." into jb-mr1.1-dev
* commit '3781523becbb2d576761c2701763ff3588294a97':
  Play a tone when wireless charging begins.
2012-12-11 14:19:41 -08:00
Jeff Brown
84e2756c0f Play a tone when wireless charging begins.
Only plays a tone if the battery level is below 95% which
is the same heuristic used when determining whether to turn
the screen on.

Use new low battery and wireless charging sounds on Mako.

Bug: 7371658
Change-Id: Ia4527ec398d024ee418a4287e1fcbf0ec83bcc24
2012-12-11 12:55:03 -08:00
Glenn Kasten
3766755665 Turn off execute bit for ordinary media files
Change-Id: Idbb4f793307d4e1c4af289f855bd4a1a781722db
2012-11-15 15:34:43 -08:00
Kenny Root
7b172a49a9 am 58ed5d74: am 768d9e1a: Merge "Correct executable bit for source files"
* commit '58ed5d748c0b9b64845975ef5844ad313de7c3f6':
  Correct executable bit for source files
2012-11-07 13:08:25 -08:00
Kenny Root
58ed5d748c am 768d9e1a: Merge "Correct executable bit for source files"
* commit '768d9e1a72ceee7d4a5f608776b87b62d6ce4a04':
  Correct executable bit for source files
2012-11-07 11:52:12 -08:00