diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2009-02-19 10:57:31 -0800 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-02-19 10:57:31 -0800 |
| commit | 3001a035439d8134a7d70d796376d1dfbff3cdcd (patch) | |
| tree | 343ccdba15a594ff6e50c874a145232753315a30 /data | |
| parent | da996f390e17e16f2dfa60e972e7ebc4f868f37e (diff) | |
| download | frameworks_base-3001a035439d8134a7d70d796376d1dfbff3cdcd.zip frameworks_base-3001a035439d8134a7d70d796376d1dfbff3cdcd.tar.gz frameworks_base-3001a035439d8134a7d70d796376d1dfbff3cdcd.tar.bz2 | |
auto import from //branches/cupcake/...@132276
Diffstat (limited to 'data')
| -rw-r--r-- | data/sounds/Android.mk | 29 | ||||
| -rw-r--r-- | data/sounds/effects/Effect_Tick.ogg (renamed from data/sounds/Effect_Tick.ogg) | bin | 3994 -> 3994 bytes | |||
| -rw-r--r-- | data/sounds/effects/KeypressDelete.ogg | bin | 0 -> 6630 bytes | |||
| -rw-r--r-- | data/sounds/effects/KeypressDelete.wav | bin | 0 -> 33424 bytes | |||
| -rw-r--r-- | data/sounds/effects/KeypressReturn.ogg | bin | 0 -> 7400 bytes | |||
| -rw-r--r-- | data/sounds/effects/KeypressReturn.wav | bin | 0 -> 46756 bytes | |||
| -rw-r--r-- | data/sounds/effects/KeypressSpacebar.ogg | bin | 0 -> 7122 bytes | |||
| -rw-r--r-- | data/sounds/effects/KeypressSpacebar.wav | bin | 0 -> 35536 bytes | |||
| -rw-r--r-- | data/sounds/effects/KeypressStandard.ogg | bin | 0 -> 5519 bytes | |||
| -rw-r--r-- | data/sounds/effects/KeypressStandard.wav | bin | 0 -> 21172 bytes | |||
| -rwxr-xr-x | data/sounds/testfiles/test.mid (renamed from data/sounds/test.mid) | bin | 2956 -> 2956 bytes |
11 files changed, 22 insertions, 7 deletions
diff --git a/data/sounds/Android.mk b/data/sounds/Android.mk index dd0dcaa..9e3697f 100644 --- a/data/sounds/Android.mk +++ b/data/sounds/Android.mk @@ -64,9 +64,6 @@ ALL_PREBUILT += $(TARGET_OUT)/media/audio/ringtones/Ring_Synth_02.ogg $(TARGET_OUT)/media/audio/ringtones/Ring_Synth_02.ogg : $(LOCAL_PATH)/Ring_Synth_02.ogg | $(ACP) $(transform-prebuilt-to-target) -ALL_PREBUILT += $(TARGET_OUT)/sounds/test.mid -$(TARGET_OUT)/sounds/test.mid : $(LOCAL_PATH)/test.mid | $(ACP) - $(transform-prebuilt-to-target) # # --- New Wave Labs ringtones # @@ -204,10 +201,6 @@ ALL_PREBUILT += $(TARGET_OUT)/media/audio/notifications/Voila.ogg $(TARGET_OUT)/media/audio/notifications/Voila.ogg : $(LOCAL_PATH)/newwavelabs/Voila.ogg | $(ACP) $(transform-prebuilt-to-target) -ALL_PREBUILT += $(TARGET_OUT)/media/audio/ui/Effect_Tick.ogg -$(TARGET_OUT)/media/audio/ui/Effect_Tick.ogg : $(LOCAL_PATH)/Effect_Tick.ogg | $(ACP) - $(transform-prebuilt-to-target) - ALL_PREBUILT += $(TARGET_OUT)/media/audio/notifications/Beat_Box_Android.ogg $(TARGET_OUT)/media/audio/notifications/Beat_Box_Android.ogg : $(LOCAL_PATH)/notifications/Beat_Box_Android.ogg | $(ACP) $(transform-prebuilt-to-target) @@ -223,3 +216,25 @@ $(TARGET_OUT)/media/audio/notifications/TaDa.ogg : $(LOCAL_PATH)/notifications/T ALL_PREBUILT += $(TARGET_OUT)/media/audio/notifications/Tinkerbell.ogg $(TARGET_OUT)/media/audio/notifications/Tinkerbell.ogg : $(LOCAL_PATH)/notifications/Tinkerbell.ogg | $(ACP) $(transform-prebuilt-to-target) + +# UI effects +ALL_PREBUILT += $(TARGET_OUT)/media/audio/ui/Effect_Tick.ogg +$(TARGET_OUT)/media/audio/ui/Effect_Tick.ogg : $(LOCAL_PATH)/effects/Effect_Tick.ogg | $(ACP) + $(transform-prebuilt-to-target) + +ALL_PREBUILT += $(TARGET_OUT)/media/audio/ui/KeypressStandard.ogg +$(TARGET_OUT)/media/audio/ui/KeypressStandard.ogg : $(LOCAL_PATH)/effects/KeypressStandard.ogg | $(ACP) + $(transform-prebuilt-to-target) + +ALL_PREBUILT += $(TARGET_OUT)/media/audio/ui/KeypressSpacebar.ogg +$(TARGET_OUT)/media/audio/ui/KeypressSpacebar.ogg : $(LOCAL_PATH)/effects/KeypressSpacebar.ogg | $(ACP) + $(transform-prebuilt-to-target) + +ALL_PREBUILT += $(TARGET_OUT)/media/audio/ui/KeypressDelete.ogg +$(TARGET_OUT)/media/audio/ui/KeypressDelete.ogg : $(LOCAL_PATH)/effects/KeypressDelete.ogg | $(ACP) + $(transform-prebuilt-to-target) + +ALL_PREBUILT += $(TARGET_OUT)/media/audio/ui/KeypressReturn.ogg +$(TARGET_OUT)/media/audio/ui/KeypressReturn.ogg : $(LOCAL_PATH)/effects/KeypressReturn.ogg | $(ACP) + $(transform-prebuilt-to-target) + diff --git a/data/sounds/Effect_Tick.ogg b/data/sounds/effects/Effect_Tick.ogg Binary files differindex c899a7d..c899a7d 100644 --- a/data/sounds/Effect_Tick.ogg +++ b/data/sounds/effects/Effect_Tick.ogg diff --git a/data/sounds/effects/KeypressDelete.ogg b/data/sounds/effects/KeypressDelete.ogg Binary files differnew file mode 100644 index 0000000..b35ea65 --- /dev/null +++ b/data/sounds/effects/KeypressDelete.ogg diff --git a/data/sounds/effects/KeypressDelete.wav b/data/sounds/effects/KeypressDelete.wav Binary files differnew file mode 100644 index 0000000..5903f7f --- /dev/null +++ b/data/sounds/effects/KeypressDelete.wav diff --git a/data/sounds/effects/KeypressReturn.ogg b/data/sounds/effects/KeypressReturn.ogg Binary files differnew file mode 100644 index 0000000..1b0fd56 --- /dev/null +++ b/data/sounds/effects/KeypressReturn.ogg diff --git a/data/sounds/effects/KeypressReturn.wav b/data/sounds/effects/KeypressReturn.wav Binary files differnew file mode 100644 index 0000000..9558fcf --- /dev/null +++ b/data/sounds/effects/KeypressReturn.wav diff --git a/data/sounds/effects/KeypressSpacebar.ogg b/data/sounds/effects/KeypressSpacebar.ogg Binary files differnew file mode 100644 index 0000000..5299337 --- /dev/null +++ b/data/sounds/effects/KeypressSpacebar.ogg diff --git a/data/sounds/effects/KeypressSpacebar.wav b/data/sounds/effects/KeypressSpacebar.wav Binary files differnew file mode 100644 index 0000000..1226a21 --- /dev/null +++ b/data/sounds/effects/KeypressSpacebar.wav diff --git a/data/sounds/effects/KeypressStandard.ogg b/data/sounds/effects/KeypressStandard.ogg Binary files differnew file mode 100644 index 0000000..8a152d1 --- /dev/null +++ b/data/sounds/effects/KeypressStandard.ogg diff --git a/data/sounds/effects/KeypressStandard.wav b/data/sounds/effects/KeypressStandard.wav Binary files differnew file mode 100644 index 0000000..0c9aa2a --- /dev/null +++ b/data/sounds/effects/KeypressStandard.wav diff --git a/data/sounds/test.mid b/data/sounds/testfiles/test.mid Binary files differindex d4ead53..d4ead53 100755 --- a/data/sounds/test.mid +++ b/data/sounds/testfiles/test.mid |