[1/2] omni: vendor sound config II
add local omni sounds in vendor to replace AOSP sounds.
Camera sounds must overrule the PRODUCT_COPY_FILES
entries from AOSP so we need to mask them to make
sure ours will be used same as we did for the properties
for default ringtone notification and alarm
Other system sounds are configured in SettingProvider
those will NOT be used on dirty flashing but only on
a clean flash
Cleanup some old deprecated overlays
Change-Id: I35d9fab82bb2f11a2b698bc91d905622d7b342c7
diff --git a/config/common.mk b/config/common.mk
index 172d0e2..7a90cb3 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -24,12 +24,6 @@
ro.setupwizard.enterprise_mode=1 \
persist.sys.root_access=1
-# default sounds
-PRODUCT_PROPERTY_OVERRIDES += \
- ro.config.ringtone=Ring_Synth_04.ogg \
- ro.config.notification_sound=pixiedust.ogg \
- ro.config.alarm_alert=Cesium.ogg
-
# enable ADB authentication if not on eng build
ifneq ($(TARGET_BUILD_VARIANT),eng)
ADDITIONAL_DEFAULT_PROPERTIES += ro.adb.secure=1
@@ -63,9 +57,23 @@
PRODUCT_COPY_FILES += \
frameworks/native/data/etc/android.software.sip.voip.xml:system/etc/permissions/android.software.sip.voip.xml
-# Dashclock
-#PRODUCT_COPY_FILES += \
-# vendor/omni/prebuilt/app/DashClock.apk:system/app/DashClock.apk
+# custom omni sounds
+PRODUCT_PROPERTY_OVERRIDES += \
+ ro.config.ringtone=omni_ringtone1.ogg \
+ ro.config.notification_sound=omni_notification1.ogg \
+ ro.config.alarm_alert=omni_alarm1.ogg
+
+PRODUCT_COPY_FILES += \
+ vendor/omni/prebuilt/sounds/camera_click_48k.ogg:system/media/audio/ui/camera_click.ogg \
+ vendor/omni/prebuilt/sounds/VideoRecord_48k.ogg:system/media/audio/ui/VideoRecord.ogg \
+ vendor/omni/prebuilt/sounds/VideoStop_48k.ogg:system/media/audio/ui/VideoStop.ogg \
+ vendor/omni/prebuilt/sounds/omni_ringtone1.ogg:system/media/audio/ringtones/omni_ringtone1.ogg \
+ vendor/omni/prebuilt/sounds/omni_ringtone2.ogg:system/media/audio/ringtones/omni_ringtone2.ogg \
+ vendor/omni/prebuilt/sounds/omni_ringtone3.ogg:system/media/audio/ringtones/omni_ringtone3.ogg \
+ vendor/omni/prebuilt/sounds/omni_alarm1.ogg:system/media/audio/alarms/omni_alarm1.ogg \
+ vendor/omni/prebuilt/sounds/omni_alarm2.ogg:system/media/audio/alarms/omni_alarm2.ogg \
+ vendor/omni/prebuilt/sounds/omni_notification1.ogg:system/media/audio/notifications/omni_notification1.ogg \
+ vendor/omni/prebuilt/sounds/omni_lowbattery1.ogg:system/media/audio/ui/omni_lowbattery1.ogg
# Additional packages
-include vendor/omni/config/packages.mk
diff --git a/overlay/common/frameworks/base/packages/SettingsProvider/res/values/defaults.xml b/overlay/common/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
index b673fdb..5ad3d11 100644
--- a/overlay/common/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
+++ b/overlay/common/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
@@ -19,4 +19,7 @@
<resources>
<!-- Use the Google propriatery backup transport service-->
<string name="def_backup_transport">com.google.android.gms/.backup.BackupTransportService</string>
+
+ <!-- user interface sound effects -->
+ <string name="def_low_battery_sound" translatable="false">/system/media/audio/ui/omni_lowbattery1.ogg</string>
</resources>
diff --git a/overlay/common_tablet/frameworks/base/packages/SystemUI/res/values/config.xml b/overlay/common_tablet/frameworks/base/packages/SystemUI/res/values/config.xml
deleted file mode 100644
index 8f8854e..0000000
--- a/overlay/common_tablet/frameworks/base/packages/SystemUI/res/values/config.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<!-- These resources are around just to allow their values to be customized
- for different hardware and product builds. -->
-
-<resources>
- <!-- Whether we're using the tablet-optimized recents interface (we use this
- value at runtime for some things) -->
- <bool name="config_recents_interface_for_tablets">true</bool>
-</resources>
diff --git a/overlay/common_tablet/packages/apps/Browser/res/values/bools.xml b/overlay/common_tablet/packages/apps/Browser/res/values/bools.xml
deleted file mode 100644
index 0d28bec..0000000
--- a/overlay/common_tablet/packages/apps/Browser/res/values/bools.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <bool name="isTablet">true</bool>
-</resources>
diff --git a/overlay/common_tablet/packages/apps/Launcher3/res/values/config.xml b/overlay/common_tablet/packages/apps/Launcher3/res/values/config.xml
deleted file mode 100644
index 81945e0..0000000
--- a/overlay/common_tablet/packages/apps/Launcher3/res/values/config.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<resources>
- <bool name="is_tablet">true</bool>
-</resources>
diff --git a/prebuilt/sounds/VideoRecord_48k.ogg b/prebuilt/sounds/VideoRecord_48k.ogg
new file mode 100644
index 0000000..3eefaed
--- /dev/null
+++ b/prebuilt/sounds/VideoRecord_48k.ogg
Binary files differ
diff --git a/prebuilt/sounds/VideoStop_48k.ogg b/prebuilt/sounds/VideoStop_48k.ogg
new file mode 100644
index 0000000..7fd9f47
--- /dev/null
+++ b/prebuilt/sounds/VideoStop_48k.ogg
Binary files differ
diff --git a/prebuilt/sounds/camera_click_48k.ogg b/prebuilt/sounds/camera_click_48k.ogg
new file mode 100644
index 0000000..b836e10
--- /dev/null
+++ b/prebuilt/sounds/camera_click_48k.ogg
Binary files differ
diff --git a/prebuilt/sounds/omni_alarm1.ogg b/prebuilt/sounds/omni_alarm1.ogg
new file mode 100644
index 0000000..216c0da
--- /dev/null
+++ b/prebuilt/sounds/omni_alarm1.ogg
Binary files differ
diff --git a/prebuilt/sounds/omni_alarm2.ogg b/prebuilt/sounds/omni_alarm2.ogg
new file mode 100644
index 0000000..5b29639
--- /dev/null
+++ b/prebuilt/sounds/omni_alarm2.ogg
Binary files differ
diff --git a/prebuilt/sounds/omni_lowbattery1.ogg b/prebuilt/sounds/omni_lowbattery1.ogg
new file mode 100644
index 0000000..7c2b1b4
--- /dev/null
+++ b/prebuilt/sounds/omni_lowbattery1.ogg
Binary files differ
diff --git a/prebuilt/sounds/omni_notification1.ogg b/prebuilt/sounds/omni_notification1.ogg
new file mode 100644
index 0000000..eb791a4
--- /dev/null
+++ b/prebuilt/sounds/omni_notification1.ogg
Binary files differ
diff --git a/prebuilt/sounds/omni_ringtone1.ogg b/prebuilt/sounds/omni_ringtone1.ogg
new file mode 100644
index 0000000..57ed750
--- /dev/null
+++ b/prebuilt/sounds/omni_ringtone1.ogg
Binary files differ
diff --git a/prebuilt/sounds/omni_ringtone2.ogg b/prebuilt/sounds/omni_ringtone2.ogg
new file mode 100644
index 0000000..c0b45d9
--- /dev/null
+++ b/prebuilt/sounds/omni_ringtone2.ogg
Binary files differ
diff --git a/prebuilt/sounds/omni_ringtone3.ogg b/prebuilt/sounds/omni_ringtone3.ogg
new file mode 100644
index 0000000..283cf5e
--- /dev/null
+++ b/prebuilt/sounds/omni_ringtone3.ogg
Binary files differ