merge with master

diff --git a/LICENSE.APLv2 b/LICENSE
similarity index 100%
rename from LICENSE.APLv2
rename to LICENSE

diff --git a/packaging/svi-data-sdk.manifest b/packaging/svi-data-sdk.manifest
index 97e8c31..138f6e0 100644 (file)
--- a/packaging/svi-data-sdk.manifest
+++ b/packaging/svi-data-sdk.manifest
@@ -1,5 +1,8 @@
 <manifest>
 <manifest>

+       <define>
+               <domain name="svi-data"/>
+       </define>

        <request>
        <request>

-               <domain name="_"/>
+               <domain name="svi-data"/>

        </request>
 </manifest>
        </request>
 </manifest>

diff --git a/packaging/svi-data-sdk.spec b/packaging/svi-data-sdk.spec
index 4bf5620..8874cbd 100644 (file)
--- a/packaging/svi-data-sdk.spec
+++ b/packaging/svi-data-sdk.spec
@@ -1,7 +1,7 @@
 Name:       svi-data-sdk
 Summary:    svi library audio data package (SDK)
 Name:       svi-data-sdk
 Summary:    svi library audio data package (SDK)

-Version:    0.1.1
-Release:    6
+Version:    0.1.2
+Release:    1

 Group:      System/Resources
 License:    Apache License, Version 2.0
 Source0:    %{name}-%{version}.tar.gz
 Group:      System/Resources
 License:    Apache License, Version 2.0
 Source0:    %{name}-%{version}.tar.gz


@@ -24,49 +24,49 @@ make %{?jobs:-j%jobs}
 rm -rf %{buildroot}
 %make_install
 
 rm -rf %{buildroot}
 %make_install
 

-%post
-mkdir -p /opt/share/svi/sound/touch
-ln -s %{_datadir}/svi/sound/touch/key0.wav            /opt/share/svi/sound/touch/key0.wav
-ln -s %{_datadir}/svi/sound/touch/key1.wav            /opt/share/svi/sound/touch/key1.wav
-ln -s %{_datadir}/svi/sound/touch/key2.wav            /opt/share/svi/sound/touch/key2.wav
-ln -s %{_datadir}/svi/sound/touch/key3.wav            /opt/share/svi/sound/touch/key3.wav
-ln -s %{_datadir}/svi/sound/touch/key4.wav            /opt/share/svi/sound/touch/key4.wav
-ln -s %{_datadir}/svi/sound/touch/key5.wav            /opt/share/svi/sound/touch/key5.wav
-ln -s %{_datadir}/svi/sound/touch/key6.wav            /opt/share/svi/sound/touch/key6.wav
-ln -s %{_datadir}/svi/sound/touch/key7.wav            /opt/share/svi/sound/touch/key7.wav
-ln -s %{_datadir}/svi/sound/touch/key8.wav            /opt/share/svi/sound/touch/key8.wav
-ln -s %{_datadir}/svi/sound/touch/key9.wav            /opt/share/svi/sound/touch/key9.wav
-ln -s %{_datadir}/svi/sound/touch/keyasterisk.wav     /opt/share/svi/sound/touch/keyasterisk.wav
-ln -s %{_datadir}/svi/sound/touch/keysharp.wav        /opt/share/svi/sound/touch/keysharp.wav
-ln -s %{_datadir}/svi/sound/touch/sip.wav             /opt/share/svi/sound/touch/sip.wav
-ln -s %{_datadir}/svi/sound/touch/sip_backspace.wav   /opt/share/svi/sound/touch/sip_backspace.wav
-ln -s %{_datadir}/svi/sound/touch/touch.wav           /opt/share/svi/sound/touch/touch.wav
-
-mkdir -p /opt/share/svi/sound/operation
-ln -s %{_datadir}/svi/sound/operation/call_connect.wav         /opt/share/svi/sound/operation/call_connect.wav
-ln -s %{_datadir}/svi/sound/operation/call_disconnect.wav      /opt/share/svi/sound/operation/call_disconnect.wav
-ln -s %{_datadir}/svi/sound/operation/charger_connection.wav   /opt/share/svi/sound/operation/charger_connection.wav
-ln -s %{_datadir}/svi/sound/operation/fully_charged.wav        /opt/share/svi/sound/operation/fully_charged.wav
-ln -s %{_datadir}/svi/sound/operation/list_reorder.wav         /opt/share/svi/sound/operation/list_reorder.wav
-ln -s %{_datadir}/svi/sound/operation/lock.wav                 /opt/share/svi/sound/operation/lock.wav
-ln -s %{_datadir}/svi/sound/operation/low_battery.wav          /opt/share/svi/sound/operation/low_battery.wav
-ln -s %{_datadir}/svi/sound/operation/minute_minder.wav        /opt/share/svi/sound/operation/minute_minder.wav
-ln -s %{_datadir}/svi/sound/operation/power_on.wav             /opt/share/svi/sound/operation/power_on.wav
-ln -s %{_datadir}/svi/sound/operation/shutter.wav              /opt/share/svi/sound/operation/shutter.wav
-ln -s %{_datadir}/svi/sound/operation/slider_sweep.wav         /opt/share/svi/sound/operation/slider_sweep.wav
-ln -s %{_datadir}/svi/sound/operation/unlock.wav               /opt/share/svi/sound/operation/unlock.wav
-ln -s %{_datadir}/svi/sound/operation/volume_control.wav       /opt/share/svi/sound/operation/volume_control.wav
-
-mkdir -p /opt/share/svi/haptic/default
-ln -s %{_datadir}/svi/haptic/default/Basic_call.tht                    /opt/share/svi/haptic/default/Basic_call.tht
+mkdir -p %{buildroot}/opt/share/svi/sound/touch
+mkdir -p %{buildroot}/opt/share/svi/sound/operation
+mkdir -p %{buildroot}/opt/share/svi/haptic/default
+mkdir -p %{buildroot}/opt/share/svi/haptic/touch

 
 

-mkdir -p /opt/share/svi/haptic/touch
-ln -s %{_datadir}/svi/haptic/touch/touch.tht                                   /opt/share/svi/haptic/touch/touch.tht
+%post
+ln -s %{_datadir}/svi/sound/touch/key0.wav            /opt/share/svi/sound/touch
+ln -s %{_datadir}/svi/sound/touch/key1.wav            /opt/share/svi/sound/touch
+ln -s %{_datadir}/svi/sound/touch/key2.wav            /opt/share/svi/sound/touch
+ln -s %{_datadir}/svi/sound/touch/key3.wav            /opt/share/svi/sound/touch
+ln -s %{_datadir}/svi/sound/touch/key4.wav            /opt/share/svi/sound/touch
+ln -s %{_datadir}/svi/sound/touch/key5.wav            /opt/share/svi/sound/touch
+ln -s %{_datadir}/svi/sound/touch/key6.wav            /opt/share/svi/sound/touch
+ln -s %{_datadir}/svi/sound/touch/key7.wav            /opt/share/svi/sound/touch
+ln -s %{_datadir}/svi/sound/touch/key8.wav            /opt/share/svi/sound/touch
+ln -s %{_datadir}/svi/sound/touch/key9.wav            /opt/share/svi/sound/touch
+ln -s %{_datadir}/svi/sound/touch/keyasterisk.wav     /opt/share/svi/sound/touch
+ln -s %{_datadir}/svi/sound/touch/keysharp.wav        /opt/share/svi/sound/touch
+ln -s %{_datadir}/svi/sound/touch/sip.wav             /opt/share/svi/sound/touch
+ln -s %{_datadir}/svi/sound/touch/sip_backspace.wav   /opt/share/svi/sound/touch
+ln -s %{_datadir}/svi/sound/touch/touch.wav           /opt/share/svi/sound/touch
+ln -s %{_datadir}/svi/sound/operation/call_connect.wav         /opt/share/svi/sound/operation
+ln -s %{_datadir}/svi/sound/operation/call_disconnect.wav      /opt/share/svi/sound/operation
+ln -s %{_datadir}/svi/sound/operation/charger_connection.wav   /opt/share/svi/sound/operation
+ln -s %{_datadir}/svi/sound/operation/fully_charged.wav        /opt/share/svi/sound/operation
+ln -s %{_datadir}/svi/sound/operation/list_reorder.wav         /opt/share/svi/sound/operation
+ln -s %{_datadir}/svi/sound/operation/lock.wav                 /opt/share/svi/sound/operation
+ln -s %{_datadir}/svi/sound/operation/low_battery.wav          /opt/share/svi/sound/operation
+ln -s %{_datadir}/svi/sound/operation/minute_minder.wav        /opt/share/svi/sound/operation
+ln -s %{_datadir}/svi/sound/operation/power_on.wav             /opt/share/svi/sound/operation
+ln -s %{_datadir}/svi/sound/operation/shutter.wav              /opt/share/svi/sound/operation
+ln -s %{_datadir}/svi/sound/operation/slider_sweep.wav         /opt/share/svi/sound/operation
+ln -s %{_datadir}/svi/sound/operation/unlock.wav               /opt/share/svi/sound/operation
+ln -s %{_datadir}/svi/sound/operation/volume_control.wav       /opt/share/svi/sound/operation
+ln -s %{_datadir}/svi/haptic/default/Basic_call.tht                            /opt/share/svi/haptic/default
+ln -s %{_datadir}/svi/haptic/touch/touch.tht                                   /opt/share/svi/haptic/touch

 
 %files
 
 %files

-%manifest svi-data-sdk.manifest

 %defattr(644,root,root,-)
 %defattr(644,root,root,-)

-%{_datadir}/svi/sound/operation/*
-%{_datadir}/svi/sound/touch/*
-%{_datadir}/svi/haptic/default/*
-%{_datadir}/svi/haptic/touch/*
+%{_datadir}/svi/*
+%defattr(666,app,app,-)
+%dir /opt/share/svi/sound/touch
+%dir /opt/share/svi/sound/operation
+%dir /opt/share/svi/haptic/default
+%dir /opt/share/svi/haptic/touch
+%manifest svi-data-sdk.manifest

diff --git a/svidata/svi/vibration.xml b/svidata/svi/vibration.xml
new file mode 100644 (file)
index 0000000..9db7adc
--- /dev/null
+++ b/svidata/svi/vibration.xml
@@ -0,0 +1,205 @@
+<?xml version="1.0" encoding="utf-8"?>
+<config>
+       <label>svi-data</label>
+       <description>Vibration Resource</description>
+       <vibration>
+               <label>FEEDBACK_PATTERN_TAP</label>
+               <data></data>
+       </vibration>
+       <vibration>
+               <label>FEEDBACK_PATTERN_SIP</label>
+               <data></data>
+       </vibration>
+       <vibration>
+               <label>FEEDBACK_PATTERN_SIP_BACKSPACE</label>
+               <data></data>
+       </vibration>
+       <vibration>
+               <label>FEEDBACK_PATTERN_MAX_CHARACTER</label>
+               <data></data>
+       </vibration>
+       <vibration>
+               <label>FEEDBACK_PATTERN_KEY0</label>
+               <data></data>
+       </vibration>
+       <vibration>
+               <label>FEEDBACK_PATTERN_KEY1</label>
+               <data></data>
+       </vibration>
+       <vibration>
+               <label>FEEDBACK_PATTERN_KEY2</label>
+               <data></data>
+       </vibration>
+       <vibration>
+               <label>FEEDBACK_PATTERN_KEY3</label>
+               <data></data>
+       </vibration>
+       <vibration>
+               <label>FEEDBACK_PATTERN_KEY4</label>
+               <data></data>
+       </vibration>
+       <vibration>
+               <label>FEEDBACK_PATTERN_KEY5</label>
+               <data></data>
+       </vibration>
+       <vibration>
+               <label>FEEDBACK_PATTERN_KEY6</label>
+               <data></data>
+       </vibration>
+       <vibration>
+               <label>FEEDBACK_PATTERN_KEY7</label>
+               <data></data>
+       </vibration>
+       <vibration>
+               <label>FEEDBACK_PATTERN_KEY8</label>
+               <data></data>
+       </vibration>
+       <vibration>
+               <label>FEEDBACK_PATTERN_KEY9</label>
+               <data></data>
+       </vibration>
+       <vibration>
+               <label>FEEDBACK_PATTERN_KEY_STAR</label>
+               <data></data>
+       </vibration>
+       <vibration>
+               <label>FEEDBACK_PATTERN_KEY_SHARP</label>
+               <data></data>
+       </vibration>
+       <vibration>
+               <label>FEEDBACK_PATTERN_HOLD</label>
+               <data>VEhGTSwAAABmbXQgFAAAAAEAAQBjAAAAZAAAAGRhdGEQ</data>
+       </vibration>
+       <vibration>
+               <label>FEEDBACK_PATTERN_MULTI_TAP</label>
+               <data>VEhGTSwAAABmbXQgFAAAAAEAAQBjAAAAZAAAAGRhdGEQ</data>
+       </vibration>
+       <vibration>
+               <label>FEEDBACK_PATTERN_HW_TAP</label>
+               <data></data>
+       </vibration>
+       <vibration>
+               <label>FEEDBACK_PATTERN_HW_HOLD</label>
+               <data></data>
+       </vibration>
+       <vibration>
+               <label>FEEDBACK_PATTERN_MESSAGE</label>
+               <data>VEhGTWoAAABmbXQgFAAAAAEAAQBjAAAArA0AAGRhdGFOAAAA////////////////////////////////////////AAAAAAAAAAAAAAAAAA</data>
+       </vibration>
+       <vibration>
+               <label>FEEDBACK_PATTERN_MESSAGE_ON_CALL</label>
+               <data>VEhGTWoAAABmbXQgFAAAAAEAAQBjAAAArA0AAGRhdGFOAAAA////////////////////////////////////////AAAAAAAAAAAAAAAAAA</data>
+       </vibration>
+       <vibration>
+               <label>FEEDBACK_PATTERN_EMAIL</label>
+               <data>VEhGTWoAAABmbXQgFAAAAAEAAQBjAAAArA0AAGRhdGFOAAAA////////////////////////////////////////AAAAAAAAAAAAAAAAAA</data>
+       </vibration>
+       <vibration>
+               <label>FEEDBACK_PATTERN_EMAIL_ON_CALL</label>
+               <data>VEhGTWoAAABmbXQgFAAAAAEAAQBjAAAArA0AAGRhdGFOAAAA////////////////////////////////////////AAAAAAAAAAAAAAAAAA</data>
+       </vibration>
+       <vibration>
+               <label>FEEDBACK_PATTERN_WAKEUP</label>
+               <data>VEhGTWoAAABmbXQgFAAAAAEAAQBjAAAArA0AAGRhdGFOAAAA////////////////////////////////////////AAAAAAAAAAAAAAAAAA</data>
+       </vibration>
+       <vibration>
+               <label>FEEDBACK_PATTERN_WAKEUP_ON_CALL</label>
+               <data>VEhGTWoAAABmbXQgFAAAAAEAAQBjAAAArA0AAGRhdGFOAAAA////////////////////////////////////////AAAAAAAAAAAAAAAAAA</data>
+       </vibration>
+       <vibration>
+               <label>FEEDBACK_PATTERN_SCHEDULE</label>
+               <data>VEhGTWoAAABmbXQgFAAAAAEAAQBjAAAArA0AAGRhdGFOAAAA////////////////////////////////////////AAAAAAAAAAAAAAAAAA</data>
+       </vibration>
+       <vibration>
+               <label>FEEDBACK_PATTERN_SCHEDULE_ON_CALL</label>
+               <data>VEhGTWoAAABmbXQgFAAAAAEAAQBjAAAArA0AAGRhdGFOAAAA////////////////////////////////////////AAAAAAAAAAAAAAAAAA</data>
+       </vibration>
+       <vibration>
+               <label>FEEDBACK_PATTERN_TIMER</label>
+               <data>VEhGTWoAAABmbXQgFAAAAAEAAQBjAAAArA0AAGRhdGFOAAAA////////////////////////////////////////AAAAAAAAAAAAAAAAAA</data>
+       </vibration>
+       <vibration>
+               <label>FEEDBACK_PATTERN_TIMER_ON_CALL</label>
+               <data>VEhGTWoAAABmbXQgFAAAAAEAAQBjAAAArA0AAGRhdGFOAAAA////////////////////////////////////////AAAAAAAAAAAAAAAAAA</data>
+       </vibration>
+       <vibration>
+               <label>FEEDBACK_PATTERN_GENERAL</label>
+               <data>VEhGTWoAAABmbXQgFAAAAAEAAQBjAAAArA0AAGRhdGFOAAAA////////////////////////////////////////AAAAAAAAAAAAAAAAAA</data>
+       </vibration>
+       <vibration>
+               <label>FEEDBACK_PATTERN_GENERAL_ON_CALL</label>
+               <data>VEhGTWoAAABmbXQgFAAAAAEAAQBjAAAArA0AAGRhdGFOAAAA////////////////////////////////////////AAAAAAAAAAAAAAAAAA</data>
+       </vibration>
+       <vibration>
+               <label>FEEDBACK_PATTERN_POWERON</label>
+               <data>VEhGTWoAAABmbXQgFAAAAAEAAQBjAAAArA0AAGRhdGFOAAAA////////////////////////////////////////AAAAAAAAAAAAAAAAAA</data>
+       </vibration>
+       <vibration>
+               <label>FEEDBACK_PATTERN_POWEROFF</label>
+               <data>VEhGTWoAAABmbXQgFAAAAAEAAQBjAAAArA0AAGRhdGFOAAAA////////////////////////////////////////AAAAAAAAAAAAAAAAAA</data>
+       </vibration>
+       <vibration>
+               <label>FEEDBACK_PATTERN_CHARGERCONN</label>
+               <data>VEhGTWoAAABmbXQgFAAAAAEAAQBjAAAArA0AAGRhdGFOAAAA////////////////////////////////////////AAAAAAAAAAAAAAAAAA</data>
+       </vibration>
+       <vibration>
+               <label>FEEDBACK_PATTERN_CHARGERCONN_ON_CALL</label>
+               <data>VEhGTWoAAABmbXQgFAAAAAEAAQBjAAAArA0AAGRhdGFOAAAA////////////////////////////////////////AAAAAAAAAAAAAAAAAA</data>
+       </vibration>
+       <vibration>
+               <label>FEEDBACK_PATTERN_FULLCHARGED</label>
+               <data>VEhGTWoAAABmbXQgFAAAAAEAAQBjAAAArA0AAGRhdGFOAAAA////////////////////////////////////////AAAAAAAAAAAAAAAAAA</data>
+       </vibration>
+       <vibration>
+               <label>FEEDBACK_PATTERN_FULLCHARGED_ON_CALL</label>
+               <data>VEhGTWoAAABmbXQgFAAAAAEAAQBjAAAArA0AAGRhdGFOAAAA////////////////////////////////////////AAAAAAAAAAAAAAAAAA</data>
+       </vibration>
+       <vibration>
+               <label>FEEDBACK_PATTERN_LOWBATT</label>
+               <data>VEhGTWoAAABmbXQgFAAAAAEAAQBjAAAArA0AAGRhdGFOAAAA////////////////////////////////////////AAAAAAAAAAAAAAAAAA</data>
+       </vibration>
+       <vibration>
+               <label>FEEDBACK_PATTERN_LOWBATT_ON_CALL</label>
+               <data>VEhGTWoAAABmbXQgFAAAAAEAAQBjAAAArA0AAGRhdGFOAAAA////////////////////////////////////////AAAAAAAAAAAAAAAAAA</data>
+       </vibration>
+       <vibration>
+               <label>FEEDBACK_PATTERN_LOCK</label>
+               <data>VEhGTWoAAABmbXQgFAAAAAEAAQBjAAAArA0AAGRhdGFOAAAA////////////////////////////////////////AAAAAAAAAAAAAAAAAA</data>
+       </vibration>
+       <vibration>
+               <label>FEEDBACK_PATTERN_UNLOCK</label>
+               <data>VEhGTWoAAABmbXQgFAAAAAEAAQBjAAAArA0AAGRhdGFOAAAA////////////////////////////////////////AAAAAAAAAAAAAAAAAA</data>
+       </vibration>
+       <vibration>
+               <label>FEEDBACK_PATTERN_CALLCONNECT</label>
+               <data>VEhGTWoAAABmbXQgFAAAAAEAAQBjAAAArA0AAGRhdGFOAAAA////////////////////////////////////////AAAAAAAAAAAAAAAAAA</data>
+       </vibration>
+       <vibration>
+               <label>FEEDBACK_PATTERN_DISCALLCONNECT</label>
+               <data>VEhGTWoAAABmbXQgFAAAAAEAAQBjAAAArA0AAGRhdGFOAAAA////////////////////////////////////////AAAAAAAAAAAAAAAAAA</data>
+       </vibration>
+       <vibration>
+               <label>FEEDBACK_PATTERN_MINUTEMINDER</label>
+               <data>VEhGTWoAAABmbXQgFAAAAAEAAQBjAAAArA0AAGRhdGFOAAAA////////////////////////////////////////AAAAAAAAAAAAAAAAAA</data>
+       </vibration>
+       <vibration>
+               <label>FEEDBACK_PATTERN_VIBRATION</label>
+               <data>VEhGTWoAAABmbXQgFAAAAAEAAQBjAAAArA0AAGRhdGFOAAAA////////////////////////////////////////AAAAAAAAAAAAAAAAAA</data>
+       </vibration>
+       <vibration>
+               <label>FEEDBACK_PATTERN_SHUTTER</label>
+               <data></data>
+       </vibration>
+       <vibration>
+               <label>FEEDBACK_PATTERN_LIST_REORDER</label>
+               <data></data>
+       </vibration>
+       <vibration>
+               <label>FEEDBACK_PATTERN_SLIDER_SWEEP</label>
+               <data></data>
+       </vibration>
+       <vibration>
+               <label>FEEDBACK_PATTERN_VOLUME_KEY</label>
+               <data></data>
+       </vibration>
+</config>