From a278f039cb955f88b1a9987630a197945da2c311 Mon Sep 17 00:00:00 2001 From: fuzz Date: Sat, 22 Feb 2014 16:39:38 +0900 Subject: cm: Move default ringtone override to telephony.mk Change-Id: If5bf8f72f9b07271145d910ba5c44dc73748ae27 --- config/common_full_phone.mk | 3 +-- config/common_full_tablet_wifionly.mk | 3 +-- config/common_mini_phone.mk | 3 +-- config/common_mini_tablet_wifionly.mk | 3 +-- config/telephony.mk | 6 +++++- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/config/common_full_phone.mk b/config/common_full_phone.mk index c12b156..f35bd58 100644 --- a/config/common_full_phone.mk +++ b/config/common_full_phone.mk @@ -1,9 +1,8 @@ # Inherit common CM stuff $(call inherit-product, vendor/cm/config/common_full.mk) -# Default ringtone +# Default notification/alarm sounds PRODUCT_PROPERTY_OVERRIDES += \ - ro.config.ringtone=Orion.ogg \ ro.config.notification_sound=Argon.ogg \ ro.config.alarm_alert=Hassium.ogg diff --git a/config/common_full_tablet_wifionly.mk b/config/common_full_tablet_wifionly.mk index 8bd6ee7..fa0080d 100644 --- a/config/common_full_tablet_wifionly.mk +++ b/config/common_full_tablet_wifionly.mk @@ -1,9 +1,8 @@ # Inherit common CM stuff $(call inherit-product, vendor/cm/config/common_full.mk) -# Default ringtone +# Default notification/alarm sounds PRODUCT_PROPERTY_OVERRIDES += \ - ro.config.ringtone=Orion.ogg \ ro.config.notification_sound=Argon.ogg \ ro.config.alarm_alert=Hassium.ogg diff --git a/config/common_mini_phone.mk b/config/common_mini_phone.mk index 785a87b..4b19306 100644 --- a/config/common_mini_phone.mk +++ b/config/common_mini_phone.mk @@ -4,9 +4,8 @@ $(call inherit-product, vendor/cm/config/common.mk) # Include CM audio files include vendor/cm/config/cm_audio.mk -# Default ringtone +# Default notification/alarm sounds PRODUCT_PROPERTY_OVERRIDES += \ - ro.config.ringtone=Orion.ogg \ ro.config.notification_sound=Argon.ogg \ ro.config.alarm_alert=Hassium.ogg diff --git a/config/common_mini_tablet_wifionly.mk b/config/common_mini_tablet_wifionly.mk index 0ab3167..882af7e 100644 --- a/config/common_mini_tablet_wifionly.mk +++ b/config/common_mini_tablet_wifionly.mk @@ -4,9 +4,8 @@ $(call inherit-product, vendor/cm/config/common.mk) # Include CM audio files include vendor/cm/config/cm_audio.mk -# Default ringtone +# Default notification/alarm sounds PRODUCT_PROPERTY_OVERRIDES += \ - ro.config.ringtone=Orion.ogg \ ro.config.notification_sound=Argon.ogg \ ro.config.alarm_alert=Hassium.ogg diff --git a/config/telephony.mk b/config/telephony.mk index 1a66862..eeccc42 100644 --- a/config/telephony.mk +++ b/config/telephony.mk @@ -6,7 +6,7 @@ PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \ vendor/cm/prebuilt/common/etc/spn-conf.xml:system/etc/spn-conf.xml -# Selective SPN list for operator number who has the problem. +# Selective SPN list for operator number who has the problem. PRODUCT_COPY_FILES += \ vendor/cm/prebuilt/common/etc/selective-spn-conf.xml:system/etc/selective-spn-conf.xml @@ -21,3 +21,7 @@ PRODUCT_PACKAGES += \ # Mms depends on SoundRecorder for recorded audio messages PRODUCT_PACKAGES += \ SoundRecorder + +# Default ringtone +PRODUCT_PROPERTY_OVERRIDES += \ + ro.config.ringtone=Orion.ogg -- cgit v1.1