From f56a3454821b9b15174d8b03eab229b52c88f547 Mon Sep 17 00:00:00 2001 From: Dan Sandler Date: Thu, 28 Aug 2014 00:37:18 -0400 Subject: [PATCH] Update soundscape for L, using classic names. (partial revert of commit 7348f744) Bug: 15725449 Change-Id: Ic1a038c906deab035f96caed42fc16c59d459965 --- data/sounds/AudioPackage13.mk | 10 ++++------ data/sounds/AudioPackage13_48.mk | 10 ++++------ .../alarms/material/ogg/{Alarm1.ogg => Argon.ogg} | Bin .../material/ogg/{Alarm1_48k.ogg => Argon_48k.ogg} | Bin .../alarms/material/ogg/{Alarm2.ogg => Carbon.ogg} | Bin .../material/ogg/{Alarm2_48k.ogg => Carbon_48k.ogg} | Bin .../alarms/material/ogg/{Alarm3.ogg => Helium.ogg} | Bin .../material/ogg/{Alarm3_48k.ogg => Helium_48k.ogg} | Bin .../alarms/material/ogg/{Alarm4.ogg => Krypton.ogg} | Bin .../ogg/{Alarm4_48k.ogg => Krypton_48k.ogg} | Bin .../alarms/material/ogg/{Alarm5.ogg => Neon.ogg} | Bin .../material/ogg/{Alarm5_48k.ogg => Neon_48k.ogg} | Bin .../alarms/material/ogg/{Alarm6.ogg => Osmium.ogg} | Bin .../material/ogg/{Alarm6_48k.ogg => Osmium_48k.ogg} | Bin .../alarms/material/ogg/{Alarm7.ogg => Oxygen.ogg} | Bin .../material/ogg/{Alarm7_48k.ogg => Oxygen_48k.ogg} | Bin .../material/ogg/{Alarm8.ogg => Platinum.ogg} | Bin .../ogg/{Alarm8_48k.ogg => Platinum_48k.ogg} | Bin .../material/ogg/{Notification3.ogg => Ariel.ogg} | Bin .../ogg/{Notification3_48k.ogg => Ariel_48k.ogg} | Bin .../material/ogg/{Notification4.ogg => Carme.ogg} | Bin .../ogg/{Notification4_48k.ogg => Carme_48k.ogg} | Bin .../material/ogg/{Notification5.ogg => Ceres.ogg} | Bin .../ogg/{Notification5_48k.ogg => Ceres_48k.ogg} | Bin .../material/ogg/{Notification6.ogg => Elara.ogg} | Bin .../ogg/{Notification6_48k.ogg => Elara_48k.ogg} | Bin .../material/ogg/{Notification7.ogg => Europa.ogg} | Bin .../ogg/{Notification7_48k.ogg => Europa_48k.ogg} | Bin .../material/ogg/{Notification8.ogg => Iapetus.ogg} | Bin .../ogg/{Notification8_48k.ogg => Iapetus_48k.ogg} | Bin .../material/ogg/{Notification9.ogg => Io.ogg} | Bin .../ogg/{Notification9_48k.ogg => Io_48k.ogg} | Bin .../material/ogg/{Notification10.ogg => Rhea.ogg} | Bin .../ogg/{Notification10_48k.ogg => Rhea_48k.ogg} | Bin .../ogg/{Notification11.ogg => Salacia.ogg} | Bin .../ogg/{Notification11_48k.ogg => Salacia_48k.ogg} | Bin .../material/ogg/{Notification1.ogg => Tethys.ogg} | Bin .../ogg/{Notification1_48k.ogg => Tethys_48k.ogg} | Bin .../material/ogg/{Notification2.ogg => Titan.ogg} | Bin .../ogg/{Notification2_48k.ogg => Titan_48k.ogg} | Bin .../material/ogg/{Ringtone4.ogg => Atria.ogg} | Bin .../ogg/{Ringtone4_48k.ogg => Atria_48k.ogg} | Bin .../material/ogg/{Ringtone5.ogg => Callisto.ogg} | Bin .../ogg/{Ringtone5_48k.ogg => Callisto_48k.ogg} | Bin .../material/ogg/{Ringtone6.ogg => Dione.ogg} | Bin .../ogg/{Ringtone6_48k.ogg => Dione_48k.ogg} | Bin .../material/ogg/{Ringtone7.ogg => Ganymede.ogg} | Bin .../ogg/{Ringtone7_48k.ogg => Ganymede_48k.ogg} | Bin .../material/ogg/{Ringtone8.ogg => Luna.ogg} | Bin .../ogg/{Ringtone8_48k.ogg => Luna_48k.ogg} | Bin .../material/ogg/{Ringtone9.ogg => Oberon.ogg} | Bin .../ogg/{Ringtone9_48k.ogg => Oberon_48k.ogg} | Bin .../material/ogg/{Ringtone10.ogg => Phobos.ogg} | Bin .../ogg/{Ringtone10_48k.ogg => Phobos_48k.ogg} | Bin .../material/ogg/{Ringtone11.ogg => Pyxis.ogg} | Bin .../ogg/{Ringtone11_48k.ogg => Pyxis_48k.ogg} | Bin .../material/ogg/{Ringtone12.ogg => Sedna.ogg} | Bin .../ogg/{Ringtone12_48k.ogg => Sedna_48k.ogg} | Bin .../material/ogg/{Ringtone1.ogg => Titania.ogg} | Bin .../ogg/{Ringtone1_48k.ogg => Titania_48k.ogg} | Bin .../material/ogg/{Ringtone2.ogg => Triton.ogg} | Bin .../ogg/{Ringtone2_48k.ogg => Triton_48k.ogg} | Bin .../material/ogg/{Ringtone3.ogg => Umbriel.ogg} | Bin .../ogg/{Ringtone3_48k.ogg => Umbriel_48k.ogg} | Bin 64 files changed, 8 insertions(+), 12 deletions(-) rename data/sounds/alarms/material/ogg/{Alarm1.ogg => Argon.ogg} (100%) rename data/sounds/alarms/material/ogg/{Alarm1_48k.ogg => Argon_48k.ogg} (100%) rename data/sounds/alarms/material/ogg/{Alarm2.ogg => Carbon.ogg} (100%) rename data/sounds/alarms/material/ogg/{Alarm2_48k.ogg => Carbon_48k.ogg} (100%) rename data/sounds/alarms/material/ogg/{Alarm3.ogg => Helium.ogg} (100%) rename data/sounds/alarms/material/ogg/{Alarm3_48k.ogg => Helium_48k.ogg} (100%) rename data/sounds/alarms/material/ogg/{Alarm4.ogg => Krypton.ogg} (100%) rename data/sounds/alarms/material/ogg/{Alarm4_48k.ogg => Krypton_48k.ogg} (100%) rename data/sounds/alarms/material/ogg/{Alarm5.ogg => Neon.ogg} (100%) rename data/sounds/alarms/material/ogg/{Alarm5_48k.ogg => Neon_48k.ogg} (100%) rename data/sounds/alarms/material/ogg/{Alarm6.ogg => Osmium.ogg} (100%) rename data/sounds/alarms/material/ogg/{Alarm6_48k.ogg => Osmium_48k.ogg} (100%) rename data/sounds/alarms/material/ogg/{Alarm7.ogg => Oxygen.ogg} (100%) rename data/sounds/alarms/material/ogg/{Alarm7_48k.ogg => Oxygen_48k.ogg} (100%) rename data/sounds/alarms/material/ogg/{Alarm8.ogg => Platinum.ogg} (100%) rename data/sounds/alarms/material/ogg/{Alarm8_48k.ogg => Platinum_48k.ogg} (100%) rename data/sounds/notifications/material/ogg/{Notification3.ogg => Ariel.ogg} (100%) rename data/sounds/notifications/material/ogg/{Notification3_48k.ogg => Ariel_48k.ogg} (100%) rename data/sounds/notifications/material/ogg/{Notification4.ogg => Carme.ogg} (100%) rename data/sounds/notifications/material/ogg/{Notification4_48k.ogg => Carme_48k.ogg} (100%) rename data/sounds/notifications/material/ogg/{Notification5.ogg => Ceres.ogg} (100%) rename data/sounds/notifications/material/ogg/{Notification5_48k.ogg => Ceres_48k.ogg} (100%) rename data/sounds/notifications/material/ogg/{Notification6.ogg => Elara.ogg} (100%) rename data/sounds/notifications/material/ogg/{Notification6_48k.ogg => Elara_48k.ogg} (100%) rename data/sounds/notifications/material/ogg/{Notification7.ogg => Europa.ogg} (100%) rename data/sounds/notifications/material/ogg/{Notification7_48k.ogg => Europa_48k.ogg} (100%) rename data/sounds/notifications/material/ogg/{Notification8.ogg => Iapetus.ogg} (100%) rename data/sounds/notifications/material/ogg/{Notification8_48k.ogg => Iapetus_48k.ogg} (100%) rename data/sounds/notifications/material/ogg/{Notification9.ogg => Io.ogg} (100%) rename data/sounds/notifications/material/ogg/{Notification9_48k.ogg => Io_48k.ogg} (100%) rename data/sounds/notifications/material/ogg/{Notification10.ogg => Rhea.ogg} (100%) rename data/sounds/notifications/material/ogg/{Notification10_48k.ogg => Rhea_48k.ogg} (100%) rename data/sounds/notifications/material/ogg/{Notification11.ogg => Salacia.ogg} (100%) rename data/sounds/notifications/material/ogg/{Notification11_48k.ogg => Salacia_48k.ogg} (100%) rename data/sounds/notifications/material/ogg/{Notification1.ogg => Tethys.ogg} (100%) rename data/sounds/notifications/material/ogg/{Notification1_48k.ogg => Tethys_48k.ogg} (100%) rename data/sounds/notifications/material/ogg/{Notification2.ogg => Titan.ogg} (100%) rename data/sounds/notifications/material/ogg/{Notification2_48k.ogg => Titan_48k.ogg} (100%) rename data/sounds/ringtones/material/ogg/{Ringtone4.ogg => Atria.ogg} (100%) rename data/sounds/ringtones/material/ogg/{Ringtone4_48k.ogg => Atria_48k.ogg} (100%) rename data/sounds/ringtones/material/ogg/{Ringtone5.ogg => Callisto.ogg} (100%) rename data/sounds/ringtones/material/ogg/{Ringtone5_48k.ogg => Callisto_48k.ogg} (100%) rename data/sounds/ringtones/material/ogg/{Ringtone6.ogg => Dione.ogg} (100%) rename data/sounds/ringtones/material/ogg/{Ringtone6_48k.ogg => Dione_48k.ogg} (100%) rename data/sounds/ringtones/material/ogg/{Ringtone7.ogg => Ganymede.ogg} (100%) rename data/sounds/ringtones/material/ogg/{Ringtone7_48k.ogg => Ganymede_48k.ogg} (100%) rename data/sounds/ringtones/material/ogg/{Ringtone8.ogg => Luna.ogg} (100%) rename data/sounds/ringtones/material/ogg/{Ringtone8_48k.ogg => Luna_48k.ogg} (100%) rename data/sounds/ringtones/material/ogg/{Ringtone9.ogg => Oberon.ogg} (100%) rename data/sounds/ringtones/material/ogg/{Ringtone9_48k.ogg => Oberon_48k.ogg} (100%) rename data/sounds/ringtones/material/ogg/{Ringtone10.ogg => Phobos.ogg} (100%) rename data/sounds/ringtones/material/ogg/{Ringtone10_48k.ogg => Phobos_48k.ogg} (100%) rename data/sounds/ringtones/material/ogg/{Ringtone11.ogg => Pyxis.ogg} (100%) rename data/sounds/ringtones/material/ogg/{Ringtone11_48k.ogg => Pyxis_48k.ogg} (100%) rename data/sounds/ringtones/material/ogg/{Ringtone12.ogg => Sedna.ogg} (100%) rename data/sounds/ringtones/material/ogg/{Ringtone12_48k.ogg => Sedna_48k.ogg} (100%) rename data/sounds/ringtones/material/ogg/{Ringtone1.ogg => Titania.ogg} (100%) rename data/sounds/ringtones/material/ogg/{Ringtone1_48k.ogg => Titania_48k.ogg} (100%) rename data/sounds/ringtones/material/ogg/{Ringtone2.ogg => Triton.ogg} (100%) rename data/sounds/ringtones/material/ogg/{Ringtone2_48k.ogg => Triton_48k.ogg} (100%) rename data/sounds/ringtones/material/ogg/{Ringtone3.ogg => Umbriel.ogg} (100%) rename data/sounds/ringtones/material/ogg/{Ringtone3_48k.ogg => Umbriel_48k.ogg} (100%) diff --git a/data/sounds/AudioPackage13.mk b/data/sounds/AudioPackage13.mk index 57fe762db44a1..9bbfa7ff1a8f0 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 187bccbcb143f..b90cd00a916ff 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 similarity index 100% rename from data/sounds/alarms/material/ogg/Alarm1.ogg rename to 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 similarity index 100% rename from data/sounds/alarms/material/ogg/Alarm1_48k.ogg rename to 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 similarity index 100% rename from data/sounds/alarms/material/ogg/Alarm2.ogg rename to 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 similarity index 100% rename from data/sounds/alarms/material/ogg/Alarm2_48k.ogg rename to 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 similarity index 100% rename from data/sounds/alarms/material/ogg/Alarm3.ogg rename to 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 similarity index 100% rename from data/sounds/alarms/material/ogg/Alarm3_48k.ogg rename to 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 similarity index 100% rename from data/sounds/alarms/material/ogg/Alarm4.ogg rename to 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 similarity index 100% rename from data/sounds/alarms/material/ogg/Alarm4_48k.ogg rename to 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 similarity index 100% rename from data/sounds/alarms/material/ogg/Alarm5.ogg rename to 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 similarity index 100% rename from data/sounds/alarms/material/ogg/Alarm5_48k.ogg rename to 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 similarity index 100% rename from data/sounds/alarms/material/ogg/Alarm6.ogg rename to 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 similarity index 100% rename from data/sounds/alarms/material/ogg/Alarm6_48k.ogg rename to 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 similarity index 100% rename from data/sounds/alarms/material/ogg/Alarm7.ogg rename to 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 similarity index 100% rename from data/sounds/alarms/material/ogg/Alarm7_48k.ogg rename to 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 similarity index 100% rename from data/sounds/alarms/material/ogg/Alarm8.ogg rename to 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 similarity index 100% rename from data/sounds/alarms/material/ogg/Alarm8_48k.ogg rename to 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 similarity index 100% rename from data/sounds/notifications/material/ogg/Notification3.ogg rename to 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 similarity index 100% rename from data/sounds/notifications/material/ogg/Notification3_48k.ogg rename to 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 similarity index 100% rename from data/sounds/notifications/material/ogg/Notification4.ogg rename to 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 similarity index 100% rename from data/sounds/notifications/material/ogg/Notification4_48k.ogg rename to 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 similarity index 100% rename from data/sounds/notifications/material/ogg/Notification5.ogg rename to 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 similarity index 100% rename from data/sounds/notifications/material/ogg/Notification5_48k.ogg rename to 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 similarity index 100% rename from data/sounds/notifications/material/ogg/Notification6.ogg rename to 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 similarity index 100% rename from data/sounds/notifications/material/ogg/Notification6_48k.ogg rename to 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 similarity index 100% rename from data/sounds/notifications/material/ogg/Notification7.ogg rename to 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 similarity index 100% rename from data/sounds/notifications/material/ogg/Notification7_48k.ogg rename to 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 similarity index 100% rename from data/sounds/notifications/material/ogg/Notification8.ogg rename to 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 similarity index 100% rename from data/sounds/notifications/material/ogg/Notification8_48k.ogg rename to 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 similarity index 100% rename from data/sounds/notifications/material/ogg/Notification9.ogg rename to 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 similarity index 100% rename from data/sounds/notifications/material/ogg/Notification9_48k.ogg rename to 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 similarity index 100% rename from data/sounds/notifications/material/ogg/Notification10.ogg rename to 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 similarity index 100% rename from data/sounds/notifications/material/ogg/Notification10_48k.ogg rename to 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 similarity index 100% rename from data/sounds/notifications/material/ogg/Notification11.ogg rename to 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 similarity index 100% rename from data/sounds/notifications/material/ogg/Notification11_48k.ogg rename to 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 similarity index 100% rename from data/sounds/notifications/material/ogg/Notification1.ogg rename to 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 similarity index 100% rename from data/sounds/notifications/material/ogg/Notification1_48k.ogg rename to 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 similarity index 100% rename from data/sounds/notifications/material/ogg/Notification2.ogg rename to 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 similarity index 100% rename from data/sounds/notifications/material/ogg/Notification2_48k.ogg rename to 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 similarity index 100% rename from data/sounds/ringtones/material/ogg/Ringtone4.ogg rename to 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 similarity index 100% rename from data/sounds/ringtones/material/ogg/Ringtone4_48k.ogg rename to 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 similarity index 100% rename from data/sounds/ringtones/material/ogg/Ringtone5.ogg rename to 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 similarity index 100% rename from data/sounds/ringtones/material/ogg/Ringtone5_48k.ogg rename to 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 similarity index 100% rename from data/sounds/ringtones/material/ogg/Ringtone6.ogg rename to 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 similarity index 100% rename from data/sounds/ringtones/material/ogg/Ringtone6_48k.ogg rename to 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 similarity index 100% rename from data/sounds/ringtones/material/ogg/Ringtone7.ogg rename to 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 similarity index 100% rename from data/sounds/ringtones/material/ogg/Ringtone7_48k.ogg rename to 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 similarity index 100% rename from data/sounds/ringtones/material/ogg/Ringtone8.ogg rename to 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 similarity index 100% rename from data/sounds/ringtones/material/ogg/Ringtone8_48k.ogg rename to 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 similarity index 100% rename from data/sounds/ringtones/material/ogg/Ringtone9.ogg rename to 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 similarity index 100% rename from data/sounds/ringtones/material/ogg/Ringtone9_48k.ogg rename to 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 similarity index 100% rename from data/sounds/ringtones/material/ogg/Ringtone10.ogg rename to 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 similarity index 100% rename from data/sounds/ringtones/material/ogg/Ringtone10_48k.ogg rename to 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 similarity index 100% rename from data/sounds/ringtones/material/ogg/Ringtone11.ogg rename to 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 similarity index 100% rename from data/sounds/ringtones/material/ogg/Ringtone11_48k.ogg rename to 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 similarity index 100% rename from data/sounds/ringtones/material/ogg/Ringtone12.ogg rename to 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 similarity index 100% rename from data/sounds/ringtones/material/ogg/Ringtone12_48k.ogg rename to 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 similarity index 100% rename from data/sounds/ringtones/material/ogg/Ringtone1.ogg rename to 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 similarity index 100% rename from data/sounds/ringtones/material/ogg/Ringtone1_48k.ogg rename to 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 similarity index 100% rename from data/sounds/ringtones/material/ogg/Ringtone2.ogg rename to 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 similarity index 100% rename from data/sounds/ringtones/material/ogg/Ringtone2_48k.ogg rename to 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 similarity index 100% rename from data/sounds/ringtones/material/ogg/Ringtone3.ogg rename to 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 similarity index 100% rename from data/sounds/ringtones/material/ogg/Ringtone3_48k.ogg rename to data/sounds/ringtones/material/ogg/Umbriel_48k.ogg