diff options
| author | Justin Ho <justinho@google.com> | 2011-01-12 15:06:18 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-01-12 15:06:19 -0800 |
| commit | 63be8dd178447fce289c940638cd37aa560d9de3 (patch) | |
| tree | 16f4a777b450d3c3524e8c280e4500e1936e982a /data | |
| parent | b08ea03c1bbb8bfa2c44d23c50155e3f34a6968c (diff) | |
| parent | f9f66848c3a5461185942ca4f72f7b38bf031a48 (diff) | |
| download | frameworks_base-63be8dd178447fce289c940638cd37aa560d9de3.zip frameworks_base-63be8dd178447fce289c940638cd37aa560d9de3.tar.gz frameworks_base-63be8dd178447fce289c940638cd37aa560d9de3.tar.bz2 | |
Merge "Updated notification sounds for trygon" into honeycomb
Diffstat (limited to 'data')
28 files changed, 12 insertions, 35 deletions
diff --git a/data/sounds/AudioPackage6.mk b/data/sounds/AudioPackage6.mk index bceaba8..e39a02e 100755 --- a/data/sounds/AudioPackage6.mk +++ b/data/sounds/AudioPackage6.mk @@ -25,26 +25,18 @@ PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/effects/Undock.ogg:system/media/audio/ui/Undock.ogg \ $(LOCAL_PATH)/effects/Lock.ogg:system/media/audio/ui/Lock.ogg \ $(LOCAL_PATH)/effects/Unlock.ogg:system/media/audio/ui/Unlock.ogg \ - $(LOCAL_PATH)/notifications/Aldebaran.ogg:system/media/audio/notifications/Aldebaran.ogg \ - $(LOCAL_PATH)/notifications/Altair.ogg:system/media/audio/notifications/Altair.ogg \ - $(LOCAL_PATH)/notifications/Antares.ogg:system/media/audio/notifications/Antares.ogg \ - $(LOCAL_PATH)/notifications/arcturus.ogg:system/media/audio/notifications/arcturus.ogg \ - $(LOCAL_PATH)/notifications/Betelgeuse.ogg:system/media/audio/notifications/Betelgeuse.ogg \ - $(LOCAL_PATH)/notifications/Canopus.ogg:system/media/audio/notifications/Canopus.ogg \ - $(LOCAL_PATH)/notifications/Capella.ogg:system/media/audio/notifications/Capella.ogg \ - $(LOCAL_PATH)/notifications/Castor.ogg:system/media/audio/notifications/Castor.ogg \ - $(LOCAL_PATH)/notifications/CetiAlpha.ogg:system/media/audio/notifications/CetiAlpha.ogg \ - $(LOCAL_PATH)/notifications/Deneb.ogg:system/media/audio/notifications/Deneb.ogg \ - $(LOCAL_PATH)/notifications/Electra.ogg:system/media/audio/notifications/Electra.ogg \ - $(LOCAL_PATH)/notifications/Fomalhaut.ogg:system/media/audio/notifications/Fomalhaut.ogg \ - $(LOCAL_PATH)/notifications/Merope.ogg:system/media/audio/notifications/Merope.ogg \ - $(LOCAL_PATH)/notifications/Polaris.ogg:system/media/audio/notifications/Polaris.ogg \ - $(LOCAL_PATH)/notifications/Pollux.ogg:system/media/audio/notifications/Pollux.ogg \ - $(LOCAL_PATH)/notifications/Procyon.ogg:system/media/audio/notifications/Procyon.ogg \ - $(LOCAL_PATH)/notifications/regulus.ogg:system/media/audio/notifications/regulus.ogg \ - $(LOCAL_PATH)/notifications/sirius.ogg:system/media/audio/notifications/sirius.ogg \ - $(LOCAL_PATH)/notifications/Sirrah.ogg:system/media/audio/notifications/Sirrah.ogg \ - $(LOCAL_PATH)/notifications/vega.ogg:system/media/audio/notifications/vega.ogg \ + $(LOCAL_PATH)/notifications/aidos.ogg:system/media/audio/notifications/aidos.ogg \ + $(LOCAL_PATH)/notifications/nomos1.ogg:system/media/audio/notifications/nomos1.ogg \ + $(LOCAL_PATH)/notifications/hypnos1.ogg:system/media/audio/notifications/hypnos1.ogg \ + $(LOCAL_PATH)/notifications/thrasos1.ogg:system/media/audio/notifications/thrasos1.ogg \ + $(LOCAL_PATH)/notifications/nomos2.ogg:system/media/audio/notifications/nomos2.ogg \ + $(LOCAL_PATH)/notifications/horkos.ogg:system/media/audio/notifications/horkos.ogg \ + $(LOCAL_PATH)/notifications/kratos1.ogg:system/media/audio/notifications/kratos1.ogg \ + $(LOCAL_PATH)/notifications/circios.ogg:system/media/audio/notifications/circios.ogg \ + $(LOCAL_PATH)/notifications/ouranos.ogg:system/media/audio/notifications/ouranos.ogg \ + $(LOCAL_PATH)/notifications/poros.ogg:system/media/audio/notifications/poros.ogg \ + $(LOCAL_PATH)/notifications/phantasos.ogg:system/media/audio/notifications/phantasos.ogg \ + $(LOCAL_PATH)/notifications/kratos2.ogg:system/media/audio/notifications/kratos2.ogg \ $(LOCAL_PATH)/ringtones/ANDROMEDA.ogg:system/media/audio/ringtones/ANDROMEDA.ogg \ $(LOCAL_PATH)/ringtones/Aquila.ogg:system/media/audio/ringtones/Aquila.ogg \ $(LOCAL_PATH)/ringtones/ArgoNavis.ogg:system/media/audio/ringtones/ArgoNavis.ogg \ @@ -70,21 +62,6 @@ PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/ringtones/Testudo.ogg:system/media/audio/ringtones/Testudo.ogg \ $(LOCAL_PATH)/ringtones/URSAMINOR.ogg:system/media/audio/ringtones/URSAMINOR.ogg \ $(LOCAL_PATH)/ringtones/Vespa.ogg:system/media/audio/ringtones/Vespa.ogg \ - $(LOCAL_PATH)/notifications/alert01.ogg:system/media/audio/notifications/alert01.ogg \ - $(LOCAL_PATH)/notifications/alert02.ogg:system/media/audio/notifications/alert02.ogg \ - $(LOCAL_PATH)/notifications/alert03.ogg:system/media/audio/notifications/alert03.ogg \ - $(LOCAL_PATH)/notifications/alert04.ogg:system/media/audio/notifications/alert04.ogg \ - $(LOCAL_PATH)/notifications/alert05.ogg:system/media/audio/notifications/alert05.ogg \ - $(LOCAL_PATH)/notifications/alert06.ogg:system/media/audio/notifications/alert06.ogg \ - $(LOCAL_PATH)/notifications/alert07.ogg:system/media/audio/notifications/alert07.ogg \ - $(LOCAL_PATH)/notifications/alert08.ogg:system/media/audio/notifications/alert08.ogg \ - $(LOCAL_PATH)/notifications/alert09.ogg:system/media/audio/notifications/alert09.ogg \ - $(LOCAL_PATH)/notifications/alert10.ogg:system/media/audio/notifications/alert10.ogg \ - $(LOCAL_PATH)/notifications/alert11.ogg:system/media/audio/notifications/alert11.ogg \ - $(LOCAL_PATH)/notifications/alert12.ogg:system/media/audio/notifications/alert12.ogg \ - $(LOCAL_PATH)/notifications/alert13.ogg:system/media/audio/notifications/alert13.ogg \ - $(LOCAL_PATH)/notifications/alert14.ogg:system/media/audio/notifications/alert14.ogg \ - $(LOCAL_PATH)/notifications/alert15.ogg:system/media/audio/notifications/alert15.ogg \ $(LOCAL_PATH)/ringtones/ringtone18.ogg:system/media/audio/ringtones/ringtone18.ogg \ $(LOCAL_PATH)/ringtones/ringtone19.ogg:system/media/audio/ringtones/ringtone19.ogg \ $(LOCAL_PATH)/ringtones/ringtone20.ogg:system/media/audio/ringtones/ringtone20.ogg \ diff --git a/data/sounds/notifications/aidos.ogg b/data/sounds/notifications/aidos.ogg Binary files differnew file mode 100755 index 0000000..d2aec75 --- /dev/null +++ b/data/sounds/notifications/aidos.ogg diff --git a/data/sounds/notifications/alert01.ogg b/data/sounds/notifications/alert01.ogg Binary files differdeleted file mode 100755 index 4b900b0..0000000 --- a/data/sounds/notifications/alert01.ogg +++ /dev/null diff --git a/data/sounds/notifications/alert02.ogg b/data/sounds/notifications/alert02.ogg Binary files differdeleted file mode 100755 index 469ea6a..0000000 --- a/data/sounds/notifications/alert02.ogg +++ /dev/null diff --git a/data/sounds/notifications/alert03.ogg b/data/sounds/notifications/alert03.ogg Binary files differdeleted file mode 100755 index 58f418b..0000000 --- a/data/sounds/notifications/alert03.ogg +++ /dev/null diff --git a/data/sounds/notifications/alert04.ogg b/data/sounds/notifications/alert04.ogg Binary files differdeleted file mode 100755 index 4730d6d..0000000 --- a/data/sounds/notifications/alert04.ogg +++ /dev/null diff --git a/data/sounds/notifications/alert05.ogg b/data/sounds/notifications/alert05.ogg Binary files differdeleted file mode 100755 index 663da31..0000000 --- a/data/sounds/notifications/alert05.ogg +++ /dev/null diff --git a/data/sounds/notifications/alert06.ogg b/data/sounds/notifications/alert06.ogg Binary files differdeleted file mode 100755 index 2861b84..0000000 --- a/data/sounds/notifications/alert06.ogg +++ /dev/null diff --git a/data/sounds/notifications/alert07.ogg b/data/sounds/notifications/alert07.ogg Binary files differdeleted file mode 100644 index 6fe905d..0000000 --- a/data/sounds/notifications/alert07.ogg +++ /dev/null diff --git a/data/sounds/notifications/alert08.ogg b/data/sounds/notifications/alert08.ogg Binary files differdeleted file mode 100644 index ee30c26..0000000 --- a/data/sounds/notifications/alert08.ogg +++ /dev/null diff --git a/data/sounds/notifications/alert09.ogg b/data/sounds/notifications/alert09.ogg Binary files differdeleted file mode 100644 index 86b2f2e..0000000 --- a/data/sounds/notifications/alert09.ogg +++ /dev/null diff --git a/data/sounds/notifications/alert10.ogg b/data/sounds/notifications/alert10.ogg Binary files differdeleted file mode 100644 index 1d93143..0000000 --- a/data/sounds/notifications/alert10.ogg +++ /dev/null diff --git a/data/sounds/notifications/alert11.ogg b/data/sounds/notifications/alert11.ogg Binary files differdeleted file mode 100644 index c7327db..0000000 --- a/data/sounds/notifications/alert11.ogg +++ /dev/null diff --git a/data/sounds/notifications/alert12.ogg b/data/sounds/notifications/alert12.ogg Binary files differdeleted file mode 100644 index 352a049..0000000 --- a/data/sounds/notifications/alert12.ogg +++ /dev/null diff --git a/data/sounds/notifications/alert13.ogg b/data/sounds/notifications/alert13.ogg Binary files differdeleted file mode 100644 index 0987360..0000000 --- a/data/sounds/notifications/alert13.ogg +++ /dev/null diff --git a/data/sounds/notifications/alert14.ogg b/data/sounds/notifications/alert14.ogg Binary files differdeleted file mode 100644 index 6e49307..0000000 --- a/data/sounds/notifications/alert14.ogg +++ /dev/null diff --git a/data/sounds/notifications/alert15.ogg b/data/sounds/notifications/alert15.ogg Binary files differdeleted file mode 100644 index b140427..0000000 --- a/data/sounds/notifications/alert15.ogg +++ /dev/null diff --git a/data/sounds/notifications/circios.ogg b/data/sounds/notifications/circios.ogg Binary files differnew file mode 100755 index 0000000..68a1871 --- /dev/null +++ b/data/sounds/notifications/circios.ogg diff --git a/data/sounds/notifications/horkos.ogg b/data/sounds/notifications/horkos.ogg Binary files differnew file mode 100755 index 0000000..171b3cb --- /dev/null +++ b/data/sounds/notifications/horkos.ogg diff --git a/data/sounds/notifications/hypnos1.ogg b/data/sounds/notifications/hypnos1.ogg Binary files differnew file mode 100755 index 0000000..4a7fc26 --- /dev/null +++ b/data/sounds/notifications/hypnos1.ogg diff --git a/data/sounds/notifications/kratos1.ogg b/data/sounds/notifications/kratos1.ogg Binary files differnew file mode 100755 index 0000000..3e1fe64 --- /dev/null +++ b/data/sounds/notifications/kratos1.ogg diff --git a/data/sounds/notifications/kratos2.ogg b/data/sounds/notifications/kratos2.ogg Binary files differnew file mode 100755 index 0000000..93d3149e --- /dev/null +++ b/data/sounds/notifications/kratos2.ogg diff --git a/data/sounds/notifications/nomos1.ogg b/data/sounds/notifications/nomos1.ogg Binary files differnew file mode 100755 index 0000000..5eb719a --- /dev/null +++ b/data/sounds/notifications/nomos1.ogg diff --git a/data/sounds/notifications/nomos2.ogg b/data/sounds/notifications/nomos2.ogg Binary files differnew file mode 100755 index 0000000..544cb4c --- /dev/null +++ b/data/sounds/notifications/nomos2.ogg diff --git a/data/sounds/notifications/ouranos.ogg b/data/sounds/notifications/ouranos.ogg Binary files differnew file mode 100755 index 0000000..d0efc3a --- /dev/null +++ b/data/sounds/notifications/ouranos.ogg diff --git a/data/sounds/notifications/phantasos.ogg b/data/sounds/notifications/phantasos.ogg Binary files differnew file mode 100755 index 0000000..ea19882 --- /dev/null +++ b/data/sounds/notifications/phantasos.ogg diff --git a/data/sounds/notifications/poros.ogg b/data/sounds/notifications/poros.ogg Binary files differnew file mode 100755 index 0000000..0a50a12 --- /dev/null +++ b/data/sounds/notifications/poros.ogg diff --git a/data/sounds/notifications/thrasos1.ogg b/data/sounds/notifications/thrasos1.ogg Binary files differnew file mode 100755 index 0000000..9b7e621 --- /dev/null +++ b/data/sounds/notifications/thrasos1.ogg |