Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 0a909a12: Merge "Updated notification and effects for Honeycomb Bug: 3389139" into honeycomb

Browse Source 
* commit '0a909a12a853f9755da031e8a39b10ca6cc1e9ac':
  Updated notification and effects for Honeycomb Bug: 3389139
This commit is contained in:
Justin Ho
2011-01-31 23:18:46 -08:00
committed by Android Git Automerger
parent ba426a7e86 0a909a12a8
commit 57aa5cbda2
73 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
data/sounds/Alarm_Classic.ogg
View File

Binary file not shown.

BIN
data/sounds/Alarm_Classic.wav Normal file
View File

Binary file not shown.

58
data/sounds/AudioPackage6.mk
View File

@@ -8,10 +8,10 @@
LOCAL_PATH:= frameworks/base/data/sounds
PRODUCT_COPY_FILES += \
$(LOCAL_PATH)/alarms/ogg/Analysis.ogg:system/media/audio/alarms/Analysis.ogg \
$(LOCAL_PATH)/alarms/ogg/Departure.ogg:system/media/audio/alarms/Departure.ogg \
$(LOCAL_PATH)/alarms/ogg/FireDrill.ogg:system/media/audio/alarms/FireDrill.ogg \
$(LOCAL_PATH)/alarms/ogg/Timing.ogg:system/media/audio/alarms/Timing.ogg \
$(LOCAL_PATH)/alarms/ogg/Barium.ogg:system/media/audio/alarms/Barium.ogg \
$(LOCAL_PATH)/alarms/ogg/Cesium.ogg:system/media/audio/alarms/Cesium.ogg \
$(LOCAL_PATH)/alarms/ogg/Plutonium.ogg:system/media/audio/alarms/Plutonium.ogg \
$(LOCAL_PATH)/alarms/ogg/Scandium.ogg:system/media/audio/alarms/Scandium.ogg \
$(LOCAL_PATH)/effects/ogg/Effect_Tick.ogg:system/media/audio/ui/Effect_Tick.ogg \
$(LOCAL_PATH)/effects/ogg/KeypressStandard.ogg:system/media/audio/ui/KeypressStandard.ogg \
$(LOCAL_PATH)/effects/ogg/KeypressSpacebar.ogg:system/media/audio/ui/KeypressSpacebar.ogg \
@@ -41,28 +41,28 @@ PRODUCT_COPY_FILES += \
$(LOCAL_PATH)/notifications/ogg/Thallium.ogg:system/media/audio/notifications/Thallium.ogg \
$(LOCAL_PATH)/notifications/ogg/Xenon.ogg:system/media/audio/notifications/Xenon.ogg \
$(LOCAL_PATH)/notifications/ogg/Zirconium.ogg:system/media/audio/notifications/Zirconium.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 \
$(LOCAL_PATH)/ringtones/BOOTES.ogg:system/media/audio/ringtones/BOOTES.ogg \
$(LOCAL_PATH)/ringtones/CANISMAJOR.ogg:system/media/audio/ringtones/CANISMAJOR.ogg \
$(LOCAL_PATH)/ringtones/Carina.ogg:system/media/audio/ringtones/Carina.ogg \
$(LOCAL_PATH)/ringtones/CASSIOPEIA.ogg:system/media/audio/ringtones/CASSIOPEIA.ogg \
$(LOCAL_PATH)/ringtones/Centaurus.ogg:system/media/audio/ringtones/Centaurus.ogg \
$(LOCAL_PATH)/ringtones/Cygnus.ogg:system/media/audio/ringtones/Cygnus.ogg \
$(LOCAL_PATH)/ringtones/Draco.ogg:system/media/audio/ringtones/Draco.ogg \
$(LOCAL_PATH)/ringtones/Eridani.ogg:system/media/audio/ringtones/Eridani.ogg \
$(LOCAL_PATH)/ringtones/hydra.ogg:system/media/audio/ringtones/hydra.ogg \
$(LOCAL_PATH)/ringtones/Lyra.ogg:system/media/audio/ringtones/Lyra.ogg \
$(LOCAL_PATH)/ringtones/Machina.ogg:system/media/audio/ringtones/Machina.ogg \
$(LOCAL_PATH)/ringtones/Orion.ogg:system/media/audio/ringtones/Orion.ogg \
$(LOCAL_PATH)/ringtones/Pegasus.ogg:system/media/audio/ringtones/Pegasus.ogg \
$(LOCAL_PATH)/ringtones/PERSEUS.ogg:system/media/audio/ringtones/PERSEUS.ogg \
$(LOCAL_PATH)/ringtones/Pyxis.ogg:system/media/audio/ringtones/Pyxis.ogg \
$(LOCAL_PATH)/ringtones/Rigel.ogg:system/media/audio/ringtones/Rigel.ogg \
$(LOCAL_PATH)/ringtones/Scarabaeus.ogg:system/media/audio/ringtones/Scarabaeus.ogg \
$(LOCAL_PATH)/ringtones/Sceptrum.ogg:system/media/audio/ringtones/Sceptrum.ogg \
$(LOCAL_PATH)/ringtones/Solarium.ogg:system/media/audio/ringtones/Solarium.ogg \
$(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)/ringtones/ogg/Andromeda.ogg:system/media/audio/ringtones/Andromeda.ogg \
$(LOCAL_PATH)/ringtones/ogg/Aquila.ogg:system/media/audio/ringtones/Aquila.ogg \
$(LOCAL_PATH)/ringtones/ogg/ArgoNavis.ogg:system/media/audio/ringtones/ArgoNavis.ogg \
$(LOCAL_PATH)/ringtones/ogg/Bootes.ogg:system/media/audio/ringtones/Bootes.ogg \
$(LOCAL_PATH)/ringtones/ogg/CanisMajor.ogg:system/media/audio/ringtones/CanisMajor.ogg \
$(LOCAL_PATH)/ringtones/ogg/Carina.ogg:system/media/audio/ringtones/Carina.ogg \
$(LOCAL_PATH)/ringtones/ogg/Cassiopeia.ogg:system/media/audio/ringtones/Cassiopeia.ogg \
$(LOCAL_PATH)/ringtones/ogg/Centaurus.ogg:system/media/audio/ringtones/Centaurus.ogg \
$(LOCAL_PATH)/ringtones/ogg/Cygnus.ogg:system/media/audio/ringtones/Cygnus.ogg \
$(LOCAL_PATH)/ringtones/ogg/Draco.ogg:system/media/audio/ringtones/Draco.ogg \
$(LOCAL_PATH)/ringtones/ogg/Eridani.ogg:system/media/audio/ringtones/Eridani.ogg \
$(LOCAL_PATH)/ringtones/ogg/Hydra.ogg:system/media/audio/ringtones/hydra.ogg \
$(LOCAL_PATH)/ringtones/ogg/Lyra.ogg:system/media/audio/ringtones/Lyra.ogg \
$(LOCAL_PATH)/ringtones/ogg/Machina.ogg:system/media/audio/ringtones/Machina.ogg \
$(LOCAL_PATH)/ringtones/ogg/Orion.ogg:system/media/audio/ringtones/Orion.ogg \
$(LOCAL_PATH)/ringtones/ogg/Pegasus.ogg:system/media/audio/ringtones/Pegasus.ogg \
$(LOCAL_PATH)/ringtones/ogg/Perseus.ogg:system/media/audio/ringtones/Perseus.ogg \
$(LOCAL_PATH)/ringtones/ogg/Pyxis.ogg:system/media/audio/ringtones/Pyxis.ogg \
$(LOCAL_PATH)/ringtones/ogg/Rigel.ogg:system/media/audio/ringtones/Rigel.ogg \
$(LOCAL_PATH)/ringtones/ogg/Scarabaeus.ogg:system/media/audio/ringtones/Scarabaeus.ogg \
$(LOCAL_PATH)/ringtones/ogg/Sceptrum.ogg:system/media/audio/ringtones/Sceptrum.ogg \
$(LOCAL_PATH)/ringtones/ogg/Solarium.ogg:system/media/audio/ringtones/Solarium.ogg \
$(LOCAL_PATH)/ringtones/ogg/Testudo.ogg:system/media/audio/ringtones/Testudo.ogg \
$(LOCAL_PATH)/ringtones/ogg/UrsaMinor.ogg:system/media/audio/ringtones/UrsaMinor.ogg \
$(LOCAL_PATH)/ringtones/ogg/Vespa.ogg:system/media/audio/ringtones/Vespa.ogg

BIN
data/sounds/alarms/Cesium.ogg Normal file
View File

Binary file not shown.

BIN
data/sounds/alarms/ogg/Barium.ogg Normal file
View File

Binary file not shown.

BIN
data/sounds/alarms/ogg/Cesium.ogg Normal file
View File

Binary file not shown.

BIN
data/sounds/alarms/ogg/Plutonium.ogg Normal file
View File

Binary file not shown.

BIN
data/sounds/alarms/ogg/Scandium.ogg Normal file
View File

Binary file not shown.

BIN
data/sounds/alarms/wav/Barium.wav Normal file
View File

Binary file not shown.

BIN
data/sounds/alarms/wav/Cesium.wav Normal file
View File

Binary file not shown.

BIN
data/sounds/alarms/wav/Plutonium.wav Normal file
View File

Binary file not shown.

BIN
data/sounds/alarms/wav/Scandium.wav Normal file
View File

Binary file not shown.

BIN
data/sounds/effects/ogg/Dock.ogg
View File

Binary file not shown.

BIN
data/sounds/effects/ogg/Effect_Tick.ogg
View File

Binary file not shown.

BIN
data/sounds/effects/ogg/KeypressDelete.ogg
View File

Binary file not shown.

BIN
data/sounds/effects/ogg/KeypressReturn.ogg
View File

Binary file not shown.

BIN
data/sounds/effects/ogg/KeypressSpacebar.ogg
View File

Binary file not shown.

BIN
data/sounds/effects/ogg/KeypressStandard.ogg
View File

Binary file not shown.

BIN
data/sounds/effects/ogg/Lock.ogg
View File

Binary file not shown.

BIN
data/sounds/effects/ogg/LowBattery.ogg
View File

Binary file not shown.

BIN
data/sounds/effects/ogg/Media_Volume.ogg Normal file
View File

Binary file not shown.

BIN
data/sounds/effects/ogg/Undock.ogg
View File

Binary file not shown.

BIN
data/sounds/effects/ogg/Unlock.ogg
View File

Binary file not shown.

BIN
data/sounds/effects/ogg/VideoRecord.ogg
View File

Binary file not shown.

BIN
data/sounds/effects/ogg/camera_click.ogg
View File

Binary file not shown.

BIN
data/sounds/effects/wav/Dock.wav Normal file
View File

Binary file not shown.

BIN
data/sounds/effects/wav/Effect_Tick.wav Normal file
View File

Binary file not shown.

BIN
data/sounds/effects/wav/KeypressDelete.wav Normal file
View File

Binary file not shown.

BIN
data/sounds/effects/wav/KeypressReturn.wav Normal file
View File

Binary file not shown.

BIN
data/sounds/effects/wav/KeypressSpacebar.wav Normal file
View File

Binary file not shown.

BIN
data/sounds/effects/wav/KeypressStandard.wav Normal file
View File

Binary file not shown.

BIN
data/sounds/effects/wav/Lock.wav Normal file
View File

Binary file not shown.

BIN
data/sounds/effects/wav/LowBattery.wav Normal file
View File

Binary file not shown.

BIN
data/sounds/effects/wav/Undock.wav Normal file
View File

Binary file not shown.

BIN
data/sounds/effects/wav/Unlock.wav Normal file
View File

Binary file not shown.

BIN
data/sounds/effects/wav/VideoRecord.wav Normal file
View File

Binary file not shown.

BIN
data/sounds/effects/wav/camera_click.wav Normal file
View File

Binary file not shown.

BIN
data/sounds/notifications/ogg/Gallium.ogg
View File

Binary file not shown.

BIN
data/sounds/notifications/ogg/Helium.ogg
View File

Binary file not shown.

BIN
data/sounds/notifications/ogg/Palladium.ogg
View File

Binary file not shown.

BIN
data/sounds/notifications/ogg/Radon.ogg
View File

Binary file not shown.

BIN
data/sounds/notifications/ogg/Rubidium.ogg
View File

Binary file not shown.

BIN
data/sounds/notifications/ogg/Selenium.ogg
View File

Binary file not shown.

BIN
data/sounds/notifications/ogg/Strontium.ogg
View File

Binary file not shown.

BIN
data/sounds/notifications/ogg/Thallium.ogg
View File

Binary file not shown.

BIN
data/sounds/notifications/ogg/Xenon.ogg
View File

Binary file not shown.

BIN
data/sounds/notifications/ogg/Zirconium.ogg
View File

Binary file not shown.

BIN
data/sounds/ringtones/ogg/Andromeda.ogg Normal file
View File

Binary file not shown.

BIN
data/sounds/ringtones/ogg/Aquila.ogg Normal file
View File

Binary file not shown.

BIN
data/sounds/ringtones/ogg/ArgoNavis.ogg Normal file
View File

Binary file not shown.

BIN
data/sounds/ringtones/ogg/Bootes.ogg Normal file
View File

Binary file not shown.

BIN
data/sounds/ringtones/ogg/CanisMajor.ogg Normal file
View File

Binary file not shown.

BIN
data/sounds/ringtones/ogg/Carina.ogg Normal file
View File

Binary file not shown.

BIN
data/sounds/ringtones/ogg/Cassiopeia.ogg Normal file
View File

Binary file not shown.

BIN
data/sounds/ringtones/ogg/Centaurus.ogg Normal file
View File

Binary file not shown.

BIN
data/sounds/ringtones/ogg/Cygnus.ogg Normal file
View File

Binary file not shown.

BIN
data/sounds/ringtones/ogg/Draco.ogg Normal file
View File

Binary file not shown.

BIN
data/sounds/ringtones/ogg/Eridani.ogg Normal file
View File

Binary file not shown.

BIN
data/sounds/ringtones/ogg/Hydra.ogg Normal file
View File

Binary file not shown.

BIN
data/sounds/ringtones/ogg/Lyra.ogg Normal file
View File

Binary file not shown.

BIN
data/sounds/ringtones/ogg/Machina.ogg Normal file
View File

Binary file not shown.

BIN
data/sounds/ringtones/ogg/Orion.ogg Normal file
View File

Binary file not shown.

BIN
data/sounds/ringtones/ogg/Pegasus.ogg Normal file
View File

Binary file not shown.

BIN
data/sounds/ringtones/ogg/Perseus.ogg Normal file
View File

Binary file not shown.

BIN
data/sounds/ringtones/ogg/Pyxis.ogg Normal file
View File

Binary file not shown.

BIN
data/sounds/ringtones/ogg/Rigel.ogg Normal file
View File

Binary file not shown.

BIN
data/sounds/ringtones/ogg/Scarabaeus.ogg Normal file
View File

Binary file not shown.

BIN
data/sounds/ringtones/ogg/Sceptrum.ogg Normal file
View File

Binary file not shown.

BIN
data/sounds/ringtones/ogg/Solarium.ogg Normal file
View File

Binary file not shown.

BIN
data/sounds/ringtones/ogg/Testudo.ogg Normal file
View File

Binary file not shown.

BIN
data/sounds/ringtones/ogg/UrsaMinor.ogg Normal file
View File

Binary file not shown.

BIN
data/sounds/ringtones/ogg/Vespa.ogg Normal file
View File

Binary file not shown.

BIN
data/sounds/ringtones/wav/Carina.wav Executable file
View File

Binary file not shown.