Merge "Update soundscape for L, using classic names." into lmp-dev

64 files changed, 8 insertions, 12 deletions

diff --git a/data/sounds/AudioPackage13.mk b/data/sounds/AudioPackage13.mk
index 57fe762..9bbfa7f 100644
--- a/data/sounds/AudioPackage13.mk
+++ b/data/sounds/AudioPackage13.mk
@@ -8,12 +8,10 @@
 LOCAL_PATH := frameworks/base/data/sounds
 
 # Simple files that do not require renaming
-ALARM_FILES := Alarm1 Alarm2 Alarm3 Alarm4 Alarm5 Alarm6 Alarm7 Alarm8 Timer
-NOTIFICATION_FILES := Notification1 Notification2 Notification3 Notification4 \
-	Notification5 Notification6 Notification7 Notification8 Notification9 \
-	Notification10 Notification11
-RINGTONE_FILES := Ringtone1 Ringtone2 Ringtone3 Ringtone4 Ringtone5 Ringtone6 \
-	Ringtone7 Ringtone8 Ringtone9 Ringtone10 Ringtone11 Ringtone12
+ALARM_FILES := Argon Carbon Helium Krypton Neon Oxygen Osmium Platinum Timer
+NOTIFICATION_FILES := Ariel Ceres Carme Elara Europa Iapetus Io Rhea Salacia Titan Tethys
+RINGTONE_FILES := Atria Callisto Dione Ganymede Luna Oberon Phobos Pyxis Sedna Titania Triton \
+	Umbriel
 EFFECT_FILES := Effect_Tick KeypressReturn KeypressInvalid KeypressDelete KeypressSpacebar KeypressStandard \
 	camera_click camera_focus Dock Undock Lock Unlock Trusted
 MATERIAL_EFFECT_FILES := VideoRecord WirelessChargingStarted LowBattery
diff --git a/data/sounds/AudioPackage13_48.mk b/data/sounds/AudioPackage13_48.mk
index 187bccb..b90cd00 100644
--- a/data/sounds/AudioPackage13_48.mk
+++ b/data/sounds/AudioPackage13_48.mk
@@ -8,12 +8,10 @@
 LOCAL_PATH := frameworks/base/data/sounds
 
 # Simple files that do not require renaming
-ALARM_FILES := Alarm1 Alarm2 Alarm3 Alarm4 Alarm5 Alarm6 Alarm7 Alarm8 Timer
-NOTIFICATION_FILES := Notification1 Notification2 Notification3 Notification4 \
-	Notification5 Notification6 Notification7 Notification8 Notification9 \
-	Notification10 Notification11
-RINGTONE_FILES := Ringtone1 Ringtone2 Ringtone3 Ringtone4 Ringtone5 Ringtone6 \
-	Ringtone7 Ringtone8 Ringtone9 Ringtone10 Ringtone11 Ringtone12
+ALARM_FILES := Argon Carbon Helium Krypton Neon Oxygen Osmium Platinum Timer
+NOTIFICATION_FILES := Ariel Ceres Carme Elara Europa Iapetus Io Rhea Salacia Titan Tethys
+RINGTONE_FILES := Atria Callisto Dione Ganymede Luna Oberon Phobos Pyxis Sedna Titania Triton \
+	Umbriel
 EFFECT_FILES := Effect_Tick KeypressReturn KeypressInvalid KeypressDelete KeypressSpacebar KeypressStandard \
 	camera_click Lock Unlock Trusted
 MATERIAL_EFFECT_FILES := VideoRecord WirelessChargingStarted LowBattery
diff --git a/data/sounds/alarms/material/ogg/Alarm1.ogg b/data/sounds/alarms/material/ogg/Argon.ogg
index 87ecfeb..87ecfeb 100644
--- a/data/sounds/alarms/material/ogg/Alarm1.ogg
+++ b/data/sounds/alarms/material/ogg/Argon.ogg
diff --git a/data/sounds/alarms/material/ogg/Alarm1_48k.ogg b/data/sounds/alarms/material/ogg/Argon_48k.ogg
index 7ca6faa..7ca6faa 100644
--- a/data/sounds/alarms/material/ogg/Alarm1_48k.ogg
+++ b/data/sounds/alarms/material/ogg/Argon_48k.ogg
diff --git a/data/sounds/alarms/material/ogg/Alarm2.ogg b/data/sounds/alarms/material/ogg/Carbon.ogg
index 0d96853..0d96853 100644
--- a/data/sounds/alarms/material/ogg/Alarm2.ogg
+++ b/data/sounds/alarms/material/ogg/Carbon.ogg
diff --git a/data/sounds/alarms/material/ogg/Alarm2_48k.ogg b/data/sounds/alarms/material/ogg/Carbon_48k.ogg
index 133fcb5..133fcb5 100644
--- a/data/sounds/alarms/material/ogg/Alarm2_48k.ogg
+++ b/data/sounds/alarms/material/ogg/Carbon_48k.ogg
diff --git a/data/sounds/alarms/material/ogg/Alarm3.ogg b/data/sounds/alarms/material/ogg/Helium.ogg
index d381448..d381448 100644
--- a/data/sounds/alarms/material/ogg/Alarm3.ogg
+++ b/data/sounds/alarms/material/ogg/Helium.ogg
diff --git a/data/sounds/alarms/material/ogg/Alarm3_48k.ogg b/data/sounds/alarms/material/ogg/Helium_48k.ogg
index a53fbb8..a53fbb8 100644
--- a/data/sounds/alarms/material/ogg/Alarm3_48k.ogg
+++ b/data/sounds/alarms/material/ogg/Helium_48k.ogg
diff --git a/data/sounds/alarms/material/ogg/Alarm4.ogg b/data/sounds/alarms/material/ogg/Krypton.ogg
index 4529aa8..4529aa8 100644
--- a/data/sounds/alarms/material/ogg/Alarm4.ogg
+++ b/data/sounds/alarms/material/ogg/Krypton.ogg
diff --git a/data/sounds/alarms/material/ogg/Alarm4_48k.ogg b/data/sounds/alarms/material/ogg/Krypton_48k.ogg
index ac8781d..ac8781d 100644
--- a/data/sounds/alarms/material/ogg/Alarm4_48k.ogg
+++ b/data/sounds/alarms/material/ogg/Krypton_48k.ogg
diff --git a/data/sounds/alarms/material/ogg/Alarm5.ogg b/data/sounds/alarms/material/ogg/Neon.ogg
index 61582d5..61582d5 100644
--- a/data/sounds/alarms/material/ogg/Alarm5.ogg
+++ b/data/sounds/alarms/material/ogg/Neon.ogg
diff --git a/data/sounds/alarms/material/ogg/Alarm5_48k.ogg b/data/sounds/alarms/material/ogg/Neon_48k.ogg
index 0f0ff03..0f0ff03 100644
--- a/data/sounds/alarms/material/ogg/Alarm5_48k.ogg
+++ b/data/sounds/alarms/material/ogg/Neon_48k.ogg
diff --git a/data/sounds/alarms/material/ogg/Alarm6.ogg b/data/sounds/alarms/material/ogg/Osmium.ogg
index 245c4ce..245c4ce 100644
--- a/data/sounds/alarms/material/ogg/Alarm6.ogg
+++ b/data/sounds/alarms/material/ogg/Osmium.ogg
diff --git a/data/sounds/alarms/material/ogg/Alarm6_48k.ogg b/data/sounds/alarms/material/ogg/Osmium_48k.ogg
index b8abc3a..b8abc3a 100644
--- a/data/sounds/alarms/material/ogg/Alarm6_48k.ogg
+++ b/data/sounds/alarms/material/ogg/Osmium_48k.ogg
diff --git a/data/sounds/alarms/material/ogg/Alarm7.ogg b/data/sounds/alarms/material/ogg/Oxygen.ogg
index 0b489bd..0b489bd 100644
--- a/data/sounds/alarms/material/ogg/Alarm7.ogg
+++ b/data/sounds/alarms/material/ogg/Oxygen.ogg
diff --git a/data/sounds/alarms/material/ogg/Alarm7_48k.ogg b/data/sounds/alarms/material/ogg/Oxygen_48k.ogg
index 0fdeab6..0fdeab6 100644
--- a/data/sounds/alarms/material/ogg/Alarm7_48k.ogg
+++ b/data/sounds/alarms/material/ogg/Oxygen_48k.ogg
diff --git a/data/sounds/alarms/material/ogg/Alarm8.ogg b/data/sounds/alarms/material/ogg/Platinum.ogg
index 053b008..053b008 100644
--- a/data/sounds/alarms/material/ogg/Alarm8.ogg
+++ b/data/sounds/alarms/material/ogg/Platinum.ogg
diff --git a/data/sounds/alarms/material/ogg/Alarm8_48k.ogg b/data/sounds/alarms/material/ogg/Platinum_48k.ogg
index 2107172..2107172 100644
--- a/data/sounds/alarms/material/ogg/Alarm8_48k.ogg
+++ b/data/sounds/alarms/material/ogg/Platinum_48k.ogg
diff --git a/data/sounds/notifications/material/ogg/Notification3.ogg b/data/sounds/notifications/material/ogg/Ariel.ogg
index ff17500..ff17500 100644
--- a/data/sounds/notifications/material/ogg/Notification3.ogg
+++ b/data/sounds/notifications/material/ogg/Ariel.ogg
diff --git a/data/sounds/notifications/material/ogg/Notification3_48k.ogg b/data/sounds/notifications/material/ogg/Ariel_48k.ogg
index b138284..b138284 100644
--- a/data/sounds/notifications/material/ogg/Notification3_48k.ogg
+++ b/data/sounds/notifications/material/ogg/Ariel_48k.ogg
diff --git a/data/sounds/notifications/material/ogg/Notification4.ogg b/data/sounds/notifications/material/ogg/Carme.ogg
index ec6e7cb..ec6e7cb 100644
--- a/data/sounds/notifications/material/ogg/Notification4.ogg
+++ b/data/sounds/notifications/material/ogg/Carme.ogg
diff --git a/data/sounds/notifications/material/ogg/Notification4_48k.ogg b/data/sounds/notifications/material/ogg/Carme_48k.ogg
index 2be9332..2be9332 100644
--- a/data/sounds/notifications/material/ogg/Notification4_48k.ogg
+++ b/data/sounds/notifications/material/ogg/Carme_48k.ogg
diff --git a/data/sounds/notifications/material/ogg/Notification5.ogg b/data/sounds/notifications/material/ogg/Ceres.ogg
index f7386a7..f7386a7 100644
--- a/data/sounds/notifications/material/ogg/Notification5.ogg
+++ b/data/sounds/notifications/material/ogg/Ceres.ogg
diff --git a/data/sounds/notifications/material/ogg/Notification5_48k.ogg b/data/sounds/notifications/material/ogg/Ceres_48k.ogg
index 0ffba07..0ffba07 100644
--- a/data/sounds/notifications/material/ogg/Notification5_48k.ogg
+++ b/data/sounds/notifications/material/ogg/Ceres_48k.ogg
diff --git a/data/sounds/notifications/material/ogg/Notification6.ogg b/data/sounds/notifications/material/ogg/Elara.ogg
index e4dcf28..e4dcf28 100644
--- a/data/sounds/notifications/material/ogg/Notification6.ogg
+++ b/data/sounds/notifications/material/ogg/Elara.ogg
diff --git a/data/sounds/notifications/material/ogg/Notification6_48k.ogg b/data/sounds/notifications/material/ogg/Elara_48k.ogg
index 2891de6..2891de6 100644
--- a/data/sounds/notifications/material/ogg/Notification6_48k.ogg
+++ b/data/sounds/notifications/material/ogg/Elara_48k.ogg
diff --git a/data/sounds/notifications/material/ogg/Notification7.ogg b/data/sounds/notifications/material/ogg/Europa.ogg
index ce94e21..ce94e21 100644
--- a/data/sounds/notifications/material/ogg/Notification7.ogg
+++ b/data/sounds/notifications/material/ogg/Europa.ogg
diff --git a/data/sounds/notifications/material/ogg/Notification7_48k.ogg b/data/sounds/notifications/material/ogg/Europa_48k.ogg
index 45c5f0a..45c5f0a 100644
--- a/data/sounds/notifications/material/ogg/Notification7_48k.ogg
+++ b/data/sounds/notifications/material/ogg/Europa_48k.ogg
diff --git a/data/sounds/notifications/material/ogg/Notification8.ogg b/data/sounds/notifications/material/ogg/Iapetus.ogg
index d7c810d..d7c810d 100644
--- a/data/sounds/notifications/material/ogg/Notification8.ogg
+++ b/data/sounds/notifications/material/ogg/Iapetus.ogg
diff --git a/data/sounds/notifications/material/ogg/Notification8_48k.ogg b/data/sounds/notifications/material/ogg/Iapetus_48k.ogg
index 8b9703e..8b9703e 100644
--- a/data/sounds/notifications/material/ogg/Notification8_48k.ogg
+++ b/data/sounds/notifications/material/ogg/Iapetus_48k.ogg
diff --git a/data/sounds/notifications/material/ogg/Notification9.ogg b/data/sounds/notifications/material/ogg/Io.ogg
index e05a529..e05a529 100644
--- a/data/sounds/notifications/material/ogg/Notification9.ogg
+++ b/data/sounds/notifications/material/ogg/Io.ogg
diff --git a/data/sounds/notifications/material/ogg/Notification9_48k.ogg b/data/sounds/notifications/material/ogg/Io_48k.ogg
index 599b3fc..599b3fc 100644
--- a/data/sounds/notifications/material/ogg/Notification9_48k.ogg
+++ b/data/sounds/notifications/material/ogg/Io_48k.ogg
diff --git a/data/sounds/notifications/material/ogg/Notification10.ogg b/data/sounds/notifications/material/ogg/Rhea.ogg
index 347c38d..347c38d 100644
--- a/data/sounds/notifications/material/ogg/Notification10.ogg
+++ b/data/sounds/notifications/material/ogg/Rhea.ogg
diff --git a/data/sounds/notifications/material/ogg/Notification10_48k.ogg b/data/sounds/notifications/material/ogg/Rhea_48k.ogg
index 1de91de..1de91de 100644
--- a/data/sounds/notifications/material/ogg/Notification10_48k.ogg
+++ b/data/sounds/notifications/material/ogg/Rhea_48k.ogg
diff --git a/data/sounds/notifications/material/ogg/Notification11.ogg b/data/sounds/notifications/material/ogg/Salacia.ogg
index ea83b5b..ea83b5b 100644
--- a/data/sounds/notifications/material/ogg/Notification11.ogg
+++ b/data/sounds/notifications/material/ogg/Salacia.ogg
diff --git a/data/sounds/notifications/material/ogg/Notification11_48k.ogg b/data/sounds/notifications/material/ogg/Salacia_48k.ogg
index dba0416..dba0416 100644
--- a/data/sounds/notifications/material/ogg/Notification11_48k.ogg
+++ b/data/sounds/notifications/material/ogg/Salacia_48k.ogg
diff --git a/data/sounds/notifications/material/ogg/Notification1.ogg b/data/sounds/notifications/material/ogg/Tethys.ogg
index fc61f70..fc61f70 100644
--- a/data/sounds/notifications/material/ogg/Notification1.ogg
+++ b/data/sounds/notifications/material/ogg/Tethys.ogg
diff --git a/data/sounds/notifications/material/ogg/Notification1_48k.ogg b/data/sounds/notifications/material/ogg/Tethys_48k.ogg
index b2ab648..b2ab648 100644
--- a/data/sounds/notifications/material/ogg/Notification1_48k.ogg
+++ b/data/sounds/notifications/material/ogg/Tethys_48k.ogg
diff --git a/data/sounds/notifications/material/ogg/Notification2.ogg b/data/sounds/notifications/material/ogg/Titan.ogg
index 0e54844..0e54844 100644
--- a/data/sounds/notifications/material/ogg/Notification2.ogg
+++ b/data/sounds/notifications/material/ogg/Titan.ogg
diff --git a/data/sounds/notifications/material/ogg/Notification2_48k.ogg b/data/sounds/notifications/material/ogg/Titan_48k.ogg
index 4c4af31..4c4af31 100644
--- a/data/sounds/notifications/material/ogg/Notification2_48k.ogg
+++ b/data/sounds/notifications/material/ogg/Titan_48k.ogg
diff --git a/data/sounds/ringtones/material/ogg/Ringtone4.ogg b/data/sounds/ringtones/material/ogg/Atria.ogg
index 173f73d..173f73d 100644
--- a/data/sounds/ringtones/material/ogg/Ringtone4.ogg
+++ b/data/sounds/ringtones/material/ogg/Atria.ogg
diff --git a/data/sounds/ringtones/material/ogg/Ringtone4_48k.ogg b/data/sounds/ringtones/material/ogg/Atria_48k.ogg
index c98a437..c98a437 100644
--- a/data/sounds/ringtones/material/ogg/Ringtone4_48k.ogg
+++ b/data/sounds/ringtones/material/ogg/Atria_48k.ogg
diff --git a/data/sounds/ringtones/material/ogg/Ringtone5.ogg b/data/sounds/ringtones/material/ogg/Callisto.ogg
index dd9bc5b..dd9bc5b 100644
--- a/data/sounds/ringtones/material/ogg/Ringtone5.ogg
+++ b/data/sounds/ringtones/material/ogg/Callisto.ogg
diff --git a/data/sounds/ringtones/material/ogg/Ringtone5_48k.ogg b/data/sounds/ringtones/material/ogg/Callisto_48k.ogg
index 44855dc..44855dc 100644
--- a/data/sounds/ringtones/material/ogg/Ringtone5_48k.ogg
+++ b/data/sounds/ringtones/material/ogg/Callisto_48k.ogg
diff --git a/data/sounds/ringtones/material/ogg/Ringtone6.ogg b/data/sounds/ringtones/material/ogg/Dione.ogg
index cf7d1cb..cf7d1cb 100644
--- a/data/sounds/ringtones/material/ogg/Ringtone6.ogg
+++ b/data/sounds/ringtones/material/ogg/Dione.ogg
diff --git a/data/sounds/ringtones/material/ogg/Ringtone6_48k.ogg b/data/sounds/ringtones/material/ogg/Dione_48k.ogg
index 8abbf98..8abbf98 100644
--- a/data/sounds/ringtones/material/ogg/Ringtone6_48k.ogg
+++ b/data/sounds/ringtones/material/ogg/Dione_48k.ogg
diff --git a/data/sounds/ringtones/material/ogg/Ringtone7.ogg b/data/sounds/ringtones/material/ogg/Ganymede.ogg
index e7ff9f4..e7ff9f4 100644
--- a/data/sounds/ringtones/material/ogg/Ringtone7.ogg
+++ b/data/sounds/ringtones/material/ogg/Ganymede.ogg
diff --git a/data/sounds/ringtones/material/ogg/Ringtone7_48k.ogg b/data/sounds/ringtones/material/ogg/Ganymede_48k.ogg
index 1ce7d33..1ce7d33 100644
--- a/data/sounds/ringtones/material/ogg/Ringtone7_48k.ogg
+++ b/data/sounds/ringtones/material/ogg/Ganymede_48k.ogg
diff --git a/data/sounds/ringtones/material/ogg/Ringtone8.ogg b/data/sounds/ringtones/material/ogg/Luna.ogg
index 8aeb3a0..8aeb3a0 100644
--- a/data/sounds/ringtones/material/ogg/Ringtone8.ogg
+++ b/data/sounds/ringtones/material/ogg/Luna.ogg
diff --git a/data/sounds/ringtones/material/ogg/Ringtone8_48k.ogg b/data/sounds/ringtones/material/ogg/Luna_48k.ogg
index a2f7f49..a2f7f49 100644
--- a/data/sounds/ringtones/material/ogg/Ringtone8_48k.ogg
+++ b/data/sounds/ringtones/material/ogg/Luna_48k.ogg
diff --git a/data/sounds/ringtones/material/ogg/Ringtone9.ogg b/data/sounds/ringtones/material/ogg/Oberon.ogg
index 145f474..145f474 100644
--- a/data/sounds/ringtones/material/ogg/Ringtone9.ogg
+++ b/data/sounds/ringtones/material/ogg/Oberon.ogg
diff --git a/data/sounds/ringtones/material/ogg/Ringtone9_48k.ogg b/data/sounds/ringtones/material/ogg/Oberon_48k.ogg
index 7f2e274..7f2e274 100644
--- a/data/sounds/ringtones/material/ogg/Ringtone9_48k.ogg
+++ b/data/sounds/ringtones/material/ogg/Oberon_48k.ogg
diff --git a/data/sounds/ringtones/material/ogg/Ringtone10.ogg b/data/sounds/ringtones/material/ogg/Phobos.ogg
index 5e312d2..5e312d2 100644
--- a/data/sounds/ringtones/material/ogg/Ringtone10.ogg
+++ b/data/sounds/ringtones/material/ogg/Phobos.ogg
diff --git a/data/sounds/ringtones/material/ogg/Ringtone10_48k.ogg b/data/sounds/ringtones/material/ogg/Phobos_48k.ogg
index cd02cbc..cd02cbc 100644
--- a/data/sounds/ringtones/material/ogg/Ringtone10_48k.ogg
+++ b/data/sounds/ringtones/material/ogg/Phobos_48k.ogg
diff --git a/data/sounds/ringtones/material/ogg/Ringtone11.ogg b/data/sounds/ringtones/material/ogg/Pyxis.ogg
index 4786b18..4786b18 100644
--- a/data/sounds/ringtones/material/ogg/Ringtone11.ogg
+++ b/data/sounds/ringtones/material/ogg/Pyxis.ogg
diff --git a/data/sounds/ringtones/material/ogg/Ringtone11_48k.ogg b/data/sounds/ringtones/material/ogg/Pyxis_48k.ogg
index 6b39351..6b39351 100644
--- a/data/sounds/ringtones/material/ogg/Ringtone11_48k.ogg
+++ b/data/sounds/ringtones/material/ogg/Pyxis_48k.ogg
diff --git a/data/sounds/ringtones/material/ogg/Ringtone12.ogg b/data/sounds/ringtones/material/ogg/Sedna.ogg
index ff889e6..ff889e6 100644
--- a/data/sounds/ringtones/material/ogg/Ringtone12.ogg
+++ b/data/sounds/ringtones/material/ogg/Sedna.ogg
diff --git a/data/sounds/ringtones/material/ogg/Ringtone12_48k.ogg b/data/sounds/ringtones/material/ogg/Sedna_48k.ogg
index 68bc35e..68bc35e 100644
--- a/data/sounds/ringtones/material/ogg/Ringtone12_48k.ogg
+++ b/data/sounds/ringtones/material/ogg/Sedna_48k.ogg
diff --git a/data/sounds/ringtones/material/ogg/Ringtone1.ogg b/data/sounds/ringtones/material/ogg/Titania.ogg
index 87a05ee..87a05ee 100644
--- a/data/sounds/ringtones/material/ogg/Ringtone1.ogg
+++ b/data/sounds/ringtones/material/ogg/Titania.ogg
diff --git a/data/sounds/ringtones/material/ogg/Ringtone1_48k.ogg b/data/sounds/ringtones/material/ogg/Titania_48k.ogg
index ebf8f32..ebf8f32 100644
--- a/data/sounds/ringtones/material/ogg/Ringtone1_48k.ogg
+++ b/data/sounds/ringtones/material/ogg/Titania_48k.ogg
diff --git a/data/sounds/ringtones/material/ogg/Ringtone2.ogg b/data/sounds/ringtones/material/ogg/Triton.ogg
index b5893bd..b5893bd 100644
--- a/data/sounds/ringtones/material/ogg/Ringtone2.ogg
+++ b/data/sounds/ringtones/material/ogg/Triton.ogg
diff --git a/data/sounds/ringtones/material/ogg/Ringtone2_48k.ogg b/data/sounds/ringtones/material/ogg/Triton_48k.ogg
index e44d01e..e44d01e 100644
--- a/data/sounds/ringtones/material/ogg/Ringtone2_48k.ogg
+++ b/data/sounds/ringtones/material/ogg/Triton_48k.ogg
diff --git a/data/sounds/ringtones/material/ogg/Ringtone3.ogg b/data/sounds/ringtones/material/ogg/Umbriel.ogg
index 193e566..193e566 100644
--- a/data/sounds/ringtones/material/ogg/Ringtone3.ogg
+++ b/data/sounds/ringtones/material/ogg/Umbriel.ogg
diff --git a/data/sounds/ringtones/material/ogg/Ringtone3_48k.ogg b/data/sounds/ringtones/material/ogg/Umbriel_48k.ogg
index 583a1d7..583a1d7 100644
--- a/data/sounds/ringtones/material/ogg/Ringtone3_48k.ogg
+++ b/data/sounds/ringtones/material/ogg/Umbriel_48k.ogg