TizenRefApp-8622 [Call UI] Convert project to Tizen 4.0

Change-Id: Icd2516581592680f6301ef172e4345a01a58ffd4

diff --git a/.cproject b/.cproject
index 8c8c08345522280fd90cdad451a4007356f19fda..c3ed9e8e42a9d723a6dfbe910daaa1abc9bb2755 100644 (file)
--- a/.cproject
+++ b/.cproject
@@ -19,7 +19,7 @@
                                </extensions>
                        </storageModule>
                        <storageModule moduleId="cdtBuildSystem" version="4.0.0">
-                               <configuration artifactName="call-ui" buildArtefactType="org.tizen.nativecore.buildArtefactType.app" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.tizen.nativecore.buildArtefactType.app,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug" description="" errorParsers="org.eclipse.cdt.core.MakeErrorParser;org.eclipse.cdt.core.GCCErrorParser;" id="org.tizen.nativecore.config.sbi.gcc45.app.debug.746875570" name="Debug" parent="org.tizen.nativecore.config.sbi.gcc45.app.debug">
+                               <configuration artifactName="w-call-ui" buildArtefactType="org.tizen.nativecore.buildArtefactType.app" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.tizen.nativecore.buildArtefactType.app,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug" description="" errorParsers="org.eclipse.cdt.core.MakeErrorParser;org.eclipse.cdt.core.GCCErrorParser;" id="org.tizen.nativecore.config.sbi.gcc45.app.debug.746875570" name="Debug" parent="org.tizen.nativecore.config.sbi.gcc45.app.debug">
                                        <folderInfo id="org.tizen.nativecore.config.sbi.gcc45.app.debug.746875570." name="/" resourcePath="">
                                                <toolChain id="org.tizen.nativecore.toolchain.sbi.gcc45.app.debug.1048479076" name="Tizen Native Toolchain" superClass="org.tizen.nativecore.toolchain.sbi.gcc45.app.debug">
                                                        <targetPlatform binaryParser="org.eclipse.cdt.core.ELF" id="org.tizen.nativeide.target.sbi.gnu.platform.base.299151930" osList="linux,win32" superClass="org.tizen.nativeide.target.sbi.gnu.platform.base"/>
@@ -30,15 +30,17 @@
                                                                <option defaultValue="gnu.cpp.compiler.debugging.level.max" id="sbi.gnu.cpp.compiler.option.debugging.level.core.1003532466" name="Debug level" superClass="sbi.gnu.cpp.compiler.option.debugging.level.core" valueType="enumerated"/>
                                                                <option defaultValue="false" id="sbi.gnu.cpp.compiler.option.misc.pic.core.58197076" name="-fPIC option" superClass="sbi.gnu.cpp.compiler.option.misc.pic.core" valueType="boolean"/>
                                                                <option id="sbi.gnu.cpp.compiler.option.1780411914" name="Tizen-Target" superClass="sbi.gnu.cpp.compiler.option" valueType="userObjs">
-                                                                       <listOptionValue builtIn="false" value="wearable-3.0-emulator.core.private.20170330_1_gcc49.i386.core.app"/>
+                                                                       <listOptionValue builtIn="false" value="wearable-4.0-emulator.core.private_gcc49.i386.core.app"/>
                                                                </option>
                                                                <option id="sbi.gnu.cpp.compiler.option.frameworks_inc.core.2060575755" name="Tizen-Frameworks-Include-Path" superClass="sbi.gnu.cpp.compiler.option.frameworks_inc.core" valueType="includePath">
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/libxml2&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/SDL2&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/appcore/&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/appcore-agent&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/appcore-watch&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/appfw&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/asp/&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/aul/&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/badge&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/base&quot;"/>
@@ -73,7 +75,6 @@
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/efl-1&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/efl-extension&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/efreet-1&quot;"/>
-                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/EGL&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/eina-1&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/eina-1/eina&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/eio-1&quot;"/>
@@ -90,14 +91,10 @@
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/fontconfig&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/freetype2&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/gio-unix-2.0&quot;"/>
-                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES&quot;"/>
-                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES2&quot;"/>
-                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES3&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/glib-2.0&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/harfbuzz&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/iotcon&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/json-glib-1.0&quot;"/>
-                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/KHR&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/location&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/maps&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/media&quot;"/>
@@ -112,7 +109,6 @@
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/phonenumber-utils&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/pkgmgr&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/rua/&quot;"/>
-                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/SDL2&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/sensor&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/storage&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/system&quot;"/>
@@ -156,15 +152,17 @@
                                                                <option defaultValue="gnu.c.debugging.level.max" id="sbi.gnu.c.compiler.option.debugging.level.core.1157370620" name="Debug level" superClass="sbi.gnu.c.compiler.option.debugging.level.core" valueType="enumerated"/>
                                                                <option defaultValue="false" id="sbi.gnu.c.compiler.option.misc.pic.core.1654013693" name="-fPIC option" superClass="sbi.gnu.c.compiler.option.misc.pic.core" valueType="boolean"/>
                                                                <option id="sbi.gnu.c.compiler.option.551225658" name="Tizen-Target" superClass="sbi.gnu.c.compiler.option" valueType="userObjs">
-                                                                       <listOptionValue builtIn="false" value="wearable-3.0-emulator.core.private.20170330_1_gcc49.i386.core.app"/>
+                                                                       <listOptionValue builtIn="false" value="wearable-4.0-emulator.core.private_gcc49.i386.core.app"/>
                                                                </option>
                                                                <option id="sbi.gnu.c.compiler.option.frameworks_inc.core.1481628386" name="Tizen-Frameworks-Include-Path" superClass="sbi.gnu.c.compiler.option.frameworks_inc.core" valueType="includePath">
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/libxml2&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/SDL2&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/appcore/&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/appcore-agent&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/appcore-watch&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/appfw&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/asp/&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/aul/&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/badge&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/base&quot;"/>
@@ -199,7 +197,6 @@
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/efl-1&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/efl-extension&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/efreet-1&quot;"/>
-                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/EGL&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/eina-1&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/eina-1/eina&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/eio-1&quot;"/>
@@ -216,14 +213,10 @@
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/fontconfig&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/freetype2&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/gio-unix-2.0&quot;"/>
-                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES&quot;"/>
-                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES2&quot;"/>
-                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES3&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/glib-2.0&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/harfbuzz&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/iotcon&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/json-glib-1.0&quot;"/>
-                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/KHR&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/location&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/maps&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/media&quot;"/>
@@ -238,7 +231,6 @@
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/phonenumber-utils&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/pkgmgr&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/rua/&quot;"/>
-                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/SDL2&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/sensor&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/storage&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/system&quot;"/>
@@ -427,35 +419,34 @@
                                </extensions>
                        </storageModule>
                        <storageModule moduleId="cdtBuildSystem" version="4.0.0">
-                               <configuration artifactName="call-ui" buildArtefactType="org.tizen.nativecore.buildArtefactType.app" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.tizen.nativecore.buildArtefactType.app,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release" description="" errorParsers="org.eclipse.cdt.core.MakeErrorParser;org.eclipse.cdt.core.GCCErrorParser;" id="org.tizen.nativecore.config.sbi.gcc45.app.release.1026856071" name="Release" parent="org.tizen.nativecore.config.sbi.gcc45.app.release">
+                               <configuration artifactName="w-call-ui" buildArtefactType="org.tizen.nativecore.buildArtefactType.app" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.tizen.nativecore.buildArtefactType.app,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release" description="" errorParsers="org.eclipse.cdt.core.MakeErrorParser;org.eclipse.cdt.core.GCCErrorParser;" id="org.tizen.nativecore.config.sbi.gcc45.app.release.1026856071" name="Release" parent="org.tizen.nativecore.config.sbi.gcc45.app.release">
                                        <folderInfo id="org.tizen.nativecore.config.sbi.gcc45.app.release.1026856071." name="/" resourcePath="">
                                                <toolChain id="org.tizen.nativecore.toolchain.sbi.gcc45.app.release.1202011079" name="Tizen Native Toolchain" superClass="org.tizen.nativecore.toolchain.sbi.gcc45.app.release">
                                                        <targetPlatform binaryParser="org.eclipse.cdt.core.ELF" id="org.tizen.nativeide.target.sbi.gnu.platform.base.1547247838" osList="linux,win32" superClass="org.tizen.nativeide.target.sbi.gnu.platform.base"/>
                                                        <builder buildPath="${workspace_loc:/call-ui}/Release" id="org.tizen.nativecore.target.sbi.gnu.builder.1410224621" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Tizen Application Builder" superClass="org.tizen.nativecore.target.sbi.gnu.builder"/>
                                                        <tool id="org.tizen.nativecore.tool.sbi.gnu.archiver.519529023" name="Archiver" superClass="org.tizen.nativecore.tool.sbi.gnu.archiver"/>
-                                                       <tool command="i386-linux-gnueabi-g++" id="org.tizen.nativecore.tool.sbi.gnu.cpp.compiler.2053654917" name="C++ Compiler" superClass="org.tizen.nativecore.tool.sbi.gnu.cpp.compiler">
+                                                       <tool command="clang++" id="org.tizen.nativecore.tool.sbi.gnu.cpp.compiler.2053654917" name="C++ Compiler" superClass="org.tizen.nativecore.tool.sbi.gnu.cpp.compiler">
                                                                <option id="gnu.cpp.compiler.option.optimization.level.1574455899" name="Optimization Level" superClass="gnu.cpp.compiler.option.optimization.level" value="gnu.cpp.compiler.optimization.level.most" valueType="enumerated"/>
                                                                <option defaultValue="gnu.cpp.compiler.debugging.level.none" id="sbi.gnu.cpp.compiler.option.debugging.level.core.1268930725" name="Debug level" superClass="sbi.gnu.cpp.compiler.option.debugging.level.core" valueType="enumerated"/>
                                                                <option defaultValue="false" id="sbi.gnu.cpp.compiler.option.misc.pic.core.1954110782" name="-fPIC option" superClass="sbi.gnu.cpp.compiler.option.misc.pic.core" valueType="boolean"/>
                                                                <option id="sbi.gnu.cpp.compiler.option.1348701994" name="Tizen-Target" superClass="sbi.gnu.cpp.compiler.option" valueType="userObjs">
-                                                                       <listOptionValue builtIn="false" value="wearable-3.0-emulator.core_gcc49.i386.core.app"/>
+                                                                       <listOptionValue builtIn="false" value="wearable-4.0-device.core.private_llvm37.armel.core.app"/>
                                                                </option>
                                                                <option id="sbi.gnu.cpp.compiler.option.frameworks_inc.core.1432667313" name="Tizen-Frameworks-Include-Path" superClass="sbi.gnu.cpp.compiler.option.frameworks_inc.core" valueType="includePath">
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/libxml2&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include&quot;"/>
-                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/EGL&quot;"/>
-                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES&quot;"/>
-                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES2&quot;"/>
-                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES3&quot;"/>
-                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/KHR&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/SDL2&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/appcore/&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/appcore-agent&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/appcore-watch&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/appfw&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/asp/&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/aul/&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/badge&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/base&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/cairo&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/calendar-service2&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/call-manager&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/chromium-ewk&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/ckm&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/contacts-svc&quot;"/>
@@ -511,16 +502,22 @@
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/messaging&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/metadata-editor&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/minizip&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/msg-service&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/network&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/notification&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/nsd/&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/phonenumber-utils&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/pkgmgr&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/rua/&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/sensor&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/storage&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/system&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/telephony&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/telephony-client&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/tzsh&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/ug-1&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/ui&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/vconf&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/vulkan&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/widget_service&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/widget_viewer_dali&quot;"/>
@@ -534,6 +531,7 @@
                                                                        <listOptionValue builtIn="false" value="${RS_COMPILER_MISC}"/>
                                                                        <listOptionValue builtIn="false" value=" -fPIE"/>
                                                                        <listOptionValue builtIn="false" value="--sysroot=&quot;${SBI_SYSROOT}&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="-mthumb"/>
                                                                </option>
                                                                <option id="gnu.cpp.compiler.option.include.paths.382544999" name="Include paths (-I)" superClass="gnu.cpp.compiler.option.include.paths" valueType="includePath">
                                                                        <listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/inc}&quot;"/>
@@ -544,29 +542,28 @@
                                                                </option>
                                                                <inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.1592357038" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
                                                        </tool>
-                                                       <tool command="i386-linux-gnueabi-gcc" id="org.tizen.nativecore.tool.sbi.gnu.c.compiler.2007452919" name="C Compiler" superClass="org.tizen.nativecore.tool.sbi.gnu.c.compiler">
+                                                       <tool command="clang" id="org.tizen.nativecore.tool.sbi.gnu.c.compiler.2007452919" name="C Compiler" superClass="org.tizen.nativecore.tool.sbi.gnu.c.compiler">
                                                                <option defaultValue="gnu.c.optimization.level.most" id="gnu.c.compiler.option.optimization.level.1436418716" name="Optimization Level" superClass="gnu.c.compiler.option.optimization.level" valueType="enumerated"/>
                                                                <option defaultValue="gnu.c.debugging.level.default" id="sbi.gnu.c.compiler.option.debugging.level.core.1220862817" name="Debug level" superClass="sbi.gnu.c.compiler.option.debugging.level.core" valueType="enumerated"/>
                                                                <option defaultValue="false" id="sbi.gnu.c.compiler.option.misc.pic.core.1659164857" name="-fPIC option" superClass="sbi.gnu.c.compiler.option.misc.pic.core" valueType="boolean"/>
                                                                <option id="sbi.gnu.c.compiler.option.207590264" name="Tizen-Target" superClass="sbi.gnu.c.compiler.option" valueType="userObjs">
-                                                                       <listOptionValue builtIn="false" value="wearable-3.0-emulator.core_gcc49.i386.core.app"/>
+                                                                       <listOptionValue builtIn="false" value="wearable-4.0-device.core.private_llvm37.armel.core.app"/>
                                                                </option>
                                                                <option id="sbi.gnu.c.compiler.option.frameworks_inc.core.1440527129" name="Tizen-Frameworks-Include-Path" superClass="sbi.gnu.c.compiler.option.frameworks_inc.core" valueType="includePath">
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/libxml2&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include&quot;"/>
-                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/EGL&quot;"/>
-                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES&quot;"/>
-                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES2&quot;"/>
-                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES3&quot;"/>
-                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/KHR&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/SDL2&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/appcore/&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/appcore-agent&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/appcore-watch&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/appfw&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/asp/&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/aul/&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/badge&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/base&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/cairo&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/calendar-service2&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/call-manager&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/chromium-ewk&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/ckm&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/contacts-svc&quot;"/>
@@ -622,16 +619,22 @@
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/messaging&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/metadata-editor&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/minizip&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/msg-service&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/network&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/notification&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/nsd/&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/phonenumber-utils&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/pkgmgr&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/rua/&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/sensor&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/storage&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/system&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/telephony&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/telephony-client&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/tzsh&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/ug-1&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/ui&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/vconf&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/vulkan&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/widget_service&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/widget_viewer_dali&quot;"/>
@@ -645,6 +648,7 @@
                                                                        <listOptionValue builtIn="false" value="${RS_COMPILER_MISC}"/>
                                                                        <listOptionValue builtIn="false" value=" -fPIE"/>
                                                                        <listOptionValue builtIn="false" value="--sysroot=&quot;${SBI_SYSROOT}&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="-mthumb"/>
                                                                </option>
                                                                <option id="gnu.c.compiler.option.include.paths.1553190282" name="Include paths (-I)" superClass="gnu.c.compiler.option.include.paths" valueType="includePath">
                                                                        <listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/inc}&quot;"/>
@@ -743,7 +747,7 @@
                                                                <inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.1638821188" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
                                                        </tool>
                                                        <tool id="org.tizen.nativeide.tool.sbi.gnu.c.linker.base.1576764897" name="C Linker" superClass="org.tizen.nativeide.tool.sbi.gnu.c.linker.base"/>
-                                                       <tool command="i386-linux-gnueabi-g++" id="org.tizen.nativecore.tool.sbi.gnu.cpp.linker.1286451421" name="C++ Linker" superClass="org.tizen.nativecore.tool.sbi.gnu.cpp.linker">
+                                                       <tool command="clang++" id="org.tizen.nativecore.tool.sbi.gnu.cpp.linker.1286451421" name="C++ Linker" superClass="org.tizen.nativecore.tool.sbi.gnu.cpp.linker">
                                                                <option defaultValue="false" id="sbi.gnu.cpp.linker.option.shared_flag.core.1339073080" name="Linker.Shared" superClass="sbi.gnu.cpp.linker.option.shared_flag.core" valueType="boolean"/>
                                                                <option defaultValue="false" id="sbi.gnu.cpp.linker.option.noundefined.core.515331444" name="Report unresolved symbol references (-Wl,--no-undefined)" superClass="sbi.gnu.cpp.linker.option.noundefined.core" valueType="boolean"/>
                                                                <option id="sbi.gnu.cpp.linker.option.frameworks_lflags.core.101022172" name="Tizen-Frameworks-Other-Lflags" superClass="sbi.gnu.cpp.linker.option.frameworks_lflags.core" valueType="stringList">
@@ -763,7 +767,7 @@
                                                                        <additionalInput kind="additionalinput" paths="$(LIBS)"/>
                                                                </inputType>
                                                        </tool>
-                                                       <tool command="i386-linux-gnueabi-as" id="org.tizen.nativeapp.tool.sbi.gnu.assembler.base.1040646105" name="Assembler" superClass="org.tizen.nativeapp.tool.sbi.gnu.assembler.base">
+                                                       <tool command="arm-linux-gnueabi-as" id="org.tizen.nativeapp.tool.sbi.gnu.assembler.base.1040646105" name="Assembler" superClass="org.tizen.nativeapp.tool.sbi.gnu.assembler.base">
                                                                <inputType id="cdt.managedbuild.tool.gnu.assembler.input.1529641874" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
                                                        </tool>
                                                        <tool id="org.tizen.nativecore.tool.fnmapgen.1478404041" name="C FN-Map Generator" superClass="org.tizen.nativecore.tool.fnmapgen"/>

diff --git a/.tproject b/.tproject
index de5a1503d693545d8929baf51e55d2fd6969d231..dd947342dc56d1a9737fddd805cedc8b83cddcd8 100644 (file)
--- a/.tproject
+++ b/.tproject
@@ -2,7 +2,7 @@
 <tproject xmlns="http://www.tizen.org/tproject">
     <platforms>
         <platform>
-            <name>wearable-3.0</name>
+            <name>wearable-4.0</name>
         </platform>
     </platforms>
     <package>

diff --git a/Build/build_c.mk b/Build/build_c.mk
index d818ab60863c060fd236ec1ec69b6a7a9a04acb7..5fffeea1e3aa3585c73d5dd50d3cc762b9f0dda5 100644 (file)
--- a/Build/build_c.mk
+++ b/Build/build_c.mk
@@ -10,10 +10,11 @@ _FUNC_CPP2O = $(call _FUNC_EXT2O,$(1),$(2),cpp)
 #  $(1) - C/C++ soruce file
 #  $(2) - output path
 #  $(3) - .ext
-CONVERT_ESC_EXT_TO_O = $(addprefix $(2)/,$(call CONVERT_4MAKE_TO_OUT,$(patsubst %.$(3),%.o,$(1))))
+#  $(4) - unique id
+CONVERT_ESC_EXT_TO_O = $(addprefix $(2)/,$(notdir $(patsubst %.$(3),%-$(4).o,$(1))))
 
-CONVERT_ESC_C_TO_O = $(call CONVERT_ESC_EXT_TO_O,$(1),$(2),c)
-CONVERT_ESC_CPP_TO_O = $(call CONVERT_ESC_EXT_TO_O,$(1),$(2),cpp)
+#CONVERT_ESC_C_TO_O = $(call CONVERT_ESC_EXT_TO_O,$(1),$(2),c)
+#CONVERT_ESC_CPP_TO_O = $(call CONVERT_ESC_EXT_TO_O,$(1),$(2),cpp)
 
 
 # parameter :
@@ -27,13 +28,13 @@ CONVERT_ESC_CPP_TO_O = $(call CONVERT_ESC_EXT_TO_O,$(1),$(2),cpp)
 # output :
 #  $(8) - output files list
 define C_BUILD_PROC_RAW
-$(call CONVERT_ESC_EXT_TO_O,$(1),$(2),$(4)) : $(call DECODE_4MAKE,$(1)) $(7)
+$(call CONVERT_ESC_EXT_TO_O,$(1),$(2),$(4),$(8)) : $(call DECODE_4MAKE,$(1)) $(7)
        @echo '  Building file: $$<'
        @echo '  Invoking: $(3) Compiler'
        $$(call MAKEDIRS,$$(@D))
        $(5) -c "$$<" -o "$$@" $(6) -Wp,@$(7)
        @echo '  Finished building: $$<'
-$(8) += $(call CONVERT_ESC_EXT_TO_O,$(1),$(2),$(4))
+$(9) += $(call CONVERT_ESC_EXT_TO_O,$(1),$(2),$(4),$(8))
 endef
 
 
@@ -50,17 +51,17 @@ endef
 #  $(10) - ext (c/cpp)
 #  $(11) - compiler ($(CC)/$(CXX))
 # output :
-#  $(12) - OBJS 
+#  $(12) - OBJS
 # return :
 #  none
 define C_PROC_RAW
 
 _OUTPUT_DIR := $$(strip $(1))#
-_SRCS := $(2)# 
-_INCS := $(3)# 
-_INC_FILES := $(4)# 
-_DEFS := $(5)# 
-_UNDEFS := $(6)# 
+_SRCS := $(2)#
+_INCS := $(3)#
+_INC_FILES := $(4)#
+_DEFS := $(5)#
+_UNDEFS := $(6)#
 
 _OPT := $(7)
 _OPT_FILE := $(8)
@@ -71,7 +72,7 @@ _COMPILER := $(11)
 
 #_OUTPUT_FILES := $(12)
 
-_ENC_SRCS := $$(call ENCODE_4MAKE,$$(_SRCS)) 
+_ENC_SRCS := $$(call ENCODE_4MAKE,$$(_SRCS))
 _ENC_SRCS := $$(filter %.$$(_EXT),$$(_ENC_SRCS))
 
 ifneq ($$(strip $$(_SRCS)),)
@@ -84,7 +85,7 @@ _ALL_SRCS := $$(call DECODE_4MAKE,$$(_NORMAL_SRCS)) \
 
 ifneq ($$(strip $$(_ALL_SRCS)),)
 
-_ENC_SRCS := $$(call ENCODE_4MAKE,$$(_ALL_SRCS)) 
+_ENC_SRCS := $$(call ENCODE_4MAKE,$$(_ALL_SRCS))
 
 _CDEFS := $$(CDEFS)
 _CDEFS += $$(addprefix -D,$$(_DEFS))
@@ -92,15 +93,17 @@ _CDEFS += $$(addprefix -U,$$(_UNDEFS))
 
 _ENC_C_INCS := $$(call ENCODE_4MAKE,$$(_INCS))
 _ENC_C_INCS := $$(addprefix -I,$$(_ENC_C_INCS))
- 
-_ENC_INC_FILES := $$(call ENCODE_4MAKE,$$(_INC_FILES)) 
+
+_ENC_INC_FILES := $$(call ENCODE_4MAKE,$$(_INC_FILES))
 _ENC_INC_FILES += $$(addprefix -include,$$(_ENC_INC_FILES))
 
 _C_INCS := $$(call DECODE_4MAKE,$$(_ENC_C_INCS) $$(_ENC_C_INC_FILES))
 
 _DEFS := $$(_CDEFS) $$(_C_INCS) -I"pch" $$(_OPT)
 
-$$(foreach var,$$(_ENC_SRCS),$$(eval $$(call C_BUILD_PROC_RAW,$$(var),$$(_OUTPUT_DIR),$$(_EXT_TITLE),$$(_EXT),$$(_COMPILER),$$(_DEFS),$$(_OPT_FILE),$(12))))
+_UNIQUE_ID = $$(firstword $$(shell echo $$(var) | $$(CKSUM)))
+
+$$(foreach var,$$(_ENC_SRCS),$$(eval $$(call C_BUILD_PROC_RAW,$$(var),$$(_OUTPUT_DIR),$$(_EXT_TITLE),$$(_EXT),$$(_COMPILER),$$(_DEFS),$$(_OPT_FILE),$$(_UNIQUE_ID),$(12))))
 
 endif  # (_(strip _(_ALL_SRCS)),)
 

diff --git a/Build/flags.mk b/Build/flags.mk
index 39e3e395c782114b7732a404ac3f6856139a31eb..2ea72ac2d30379e468d199f90ea7a131503428ed 100644 (file)
--- a/Build/flags.mk
+++ b/Build/flags.mk
@@ -1,6 +1,6 @@
 
-DEBUG_OP = 
-CPP_DEBUG_OP = -g3 
+DEBUG_OP = -D_DEBUG 
+CPP_DEBUG_OP = -g3 -D_DEBUG 
 
 OPTIMIZATION_OP = 
 CPP_OPTIMIZATION_OP = -O0 

diff --git a/Build/tooldef.mk b/Build/tooldef.mk
index fded35b84fe9b3bb17de5ed900aeb83422bece9e..c62243c3abd95299a04a7c8dcedcd387eea89dda 100644 (file)
--- a/Build/tooldef.mk
+++ b/Build/tooldef.mk
@@ -61,3 +61,10 @@ MSGFMT = $(MSGFMT_BIN)
 else
 MSGFMT = msgfmt
 endif
+
+ifneq ($(strip $(CKSUM_BIN)),)
+CKSUM = $(CKSUM_BIN)
+else
+CKSUM = cksum
+endif
+

diff --git a/project_def.prop b/project_def.prop
index 1caca2cbdb2c910e89db0a08affaf87590fa7500..6151b2e01eef111418d9ddbbfc0bd9bd2fc8a1f0 100644 (file)
--- a/project_def.prop
+++ b/project_def.prop
@@ -1,15 +1,15 @@
 
 # Project Name
-APPNAME = call-ui
+APPNAME = w-call-ui
 
 # Project Type
 type = app
 
 # Project Profile
-profile = wearable-3.0
+profile = wearable-4.0
 
 # C/CPP Sources
-USER_SRCS = src/call-ui.cpp 
+USER_SRCS = ucl/src/gui/Naviframe.cpp ucl/src/gui/WidgetItem.cpp src/presenters/InstanceManager.cpp ucl/src/appfw/UIApp.cpp src/presenters/AcceptDialog.cpp ucl/src/gui/NaviItem.cpp src/model/CallManager.cpp ucl/src/gui/Layout.cpp src/model/IncomingCall.cpp src/presenters/Page.cpp src/resources.cpp src/model/CallBuilder.cpp src/presenters/Instance.cpp ucl/src/gui/Window.cpp src/presenters/CallStatus.cpp ucl/src/gui/Widget.cpp src/model/ActiveCall.cpp src/model/RejectMsgProvider.cpp src/model/Call.cpp ucl/src/appfw/SysEventProvider.cpp src/types.cpp src/presenters/RejectMsgPresenter.cpp src/presenters/CallInfoPresenter.cpp src/model/BatteryStateSource.cpp src/model/ConnectionStateSource.cpp src/presenters/Presenter.cpp src/model/CallClient.cpp src/model/ContactInfo.cpp src/model/EndCall.cpp src/presenters/Indicator.cpp src/presenters/MainPage.cpp src/model/RssiStateSource.cpp src/view/helpers.cpp src/model/HdVoiceStateSource.cpp ucl/src/util/logging.cpp ucl/src/util/types/Result.cpp ucl/src/misc/Variant.cpp src/model/IndicatorStateProvider.cpp src/presenters/helpers.cpp src/main.cpp src/view/VolumeControl.cpp src/model/MsgClient.cpp src/model/CallInfo.cpp ucl/src/appfw/helpers.cpp ucl/src/gui/ElmWidget.cpp src/model/SimSlotStateSource.cpp src/presenters/AcceptRejectPresenter.cpp ucl/src/gui/EdjeWidget.cpp src/model/ConferenceCallInfo.cpp src/model/HeldCall.cpp src/model/SoundManager.cpp src/model/RejectMsg.cpp ucl/src/appfw/InstanceManagerBase.cpp 
 
 # EDC Sources
 USER_EDCS =  
@@ -36,21 +36,26 @@ USER_OBJS =
 USER_C_INC_DIRS = 
 USER_INC_FILES = 
 ## C++ Compiler
-USER_CPP_INC_DIRS = inc 
+USER_CPP_INC_DIRS = inc ucl/inc 
 USER_CPP_INC_FILES = 
 
 USER_INC_DIRS = $(USER_C_INC_DIRS) $(USER_CPP_INC_DIRS)
 
 # User Library Path
-USER_LIB_DIRS = lib 
+USER_LIB_DIRS = 
 
 # EDC Resource Path
-USER_EDCS_IMAGE_DIRS = ${OUTPUT_DIR} 
-USER_EDCS_SOUND_DIRS = ${OUTPUT_DIR} 
-USER_EDCS_FONT_DIRS = ${OUTPUT_DIR} 
+USER_EDCS_IMAGE_DIRS = ${OUTPUT_DIR} edc/images 
+USER_EDCS_SOUND_DIRS = 
+USER_EDCS_FONT_DIRS = 
 
 # EDC Flags
-USER_EXT_EDC_KEYS = 
+USER_EXT_EDC_KEYS = EDC0 
+
+USER_EXT_EDC0_EDCS = res/edje/theme.edc 
+USER_EXT_EDC0_EDCS_IMAGE_DIRS = ${OUTPUT_DIR} edc/images 
+USER_EXT_EDC0_EDCS_SOUND_DIRS = 
+USER_EXT_EDC0_EDCS_FONT_DIRS = 
 
 # Resource Filter
 USER_RES_INCLUDE = 

diff --git a/src/model/CallManager.h b/src/model/CallManager.h
index 0dde5c67b0f494f158dcc3be5d86679414ccc734..c1b24f5250bb89326faf9a596df5fe51f14e5469 100644 (file)
--- a/src/model/CallManager.h
+++ b/src/model/CallManager.h
@@ -79,7 +79,6 @@ namespace callui {
        private:
                CallClientSRef m_callClient;
                RejectMsgProviderSRef m_rejectMsgProvider;
-               MsgClientSRef m_msgClient;
                ICallManagerListenerWRef m_listener;
                IncomingCallSRef m_incomingCall;
                ActiveCallSRef m_activeCall;

diff --git a/src/presenters/MainPage.cpp b/src/presenters/MainPage.cpp
index db250f9b26f872678f938f67ddb40569d8b1dbef..fc1b84804fdcdbbda3054c3fa350af963680f9ea 100644 (file)
--- a/src/presenters/MainPage.cpp
+++ b/src/presenters/MainPage.cpp
@@ -242,14 +242,14 @@ namespace callui {
 
                auto provider = incom->getRejectMsgProvider();
                if (!provider) {
-                       LOG_RETURN(RES_FAIL, "Reject message provider is NULL");
+                       ELOG("Reject message provider is NULL");
                }
 
                FAIL_RETURN(createAcceptRejectPresenter(),
                                "createAcceptRejectPresenter() failed!");
 
                if (!isUnknownCaller(*incom->getInfo())
-                               && (provider->getMsgCount() > 0)) {
+                               && (provider && provider->getMsgCount() > 0)) {
                        m_rmLy = Layout::Builder().
                                        setTheme(impl::LAYOUT_REJECT_MSG_WIDGET).
                                        setIsOwner(true).
@@ -365,6 +365,7 @@ namespace callui {
        {
                auto end = m_cm->getEndCall();
                if (!end) {
+                       m_ecTimer = nullptr;
                        requestExit();
                        LOG_RETURN_VALUE(RES_FAIL, ECORE_CALLBACK_CANCEL, "end is NULL");
                }

diff --git a/tizen-manifest.xml b/tizen-manifest.xml
index b2aae8f19658cdf95e500770aaba8d3f4b16fe5a..b972fd792248d296e08dd9b61607e60cb1a478b8 100644 (file)
--- a/tizen-manifest.xml
+++ b/tizen-manifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<manifest xmlns="http://tizen.org/ns/packages" api-version="3.0" package="org.tizen.call-ui" version="1.0.0">
+<manifest xmlns="http://tizen.org/ns/packages" api-version="4.0" package="org.tizen.w-call-ui" version="1.0.0">
     <profile name="wearable"/>
-    <ui-application appid="org.tizen.call-ui" exec="call-ui" multiple="false" nodisplay="true" taskmanage="false" type="capp">
-        <label>call-ui</label>
+    <ui-application appid="org.tizen.w-call-ui" exec="w-call-ui" multiple="false" nodisplay="true" taskmanage="false" type="capp">
+        <label>Voice Call</label>
         <icon>call-ui.png</icon>
         <app-control>
             <operation name="http://tizen.org/appcontrol/operation/call"/>
@@ -21,8 +21,7 @@
         <privilege>http://tizen.org/privilege/contact.read</privilege>
         <privilege>http://tizen.org/privilege/message.write</privilege>
         <privilege>http://tizen.org/privilege/notification</privilege>
-        <privilege>http://tizen.org/privilege/message.read</privilege>
         <privilege>http://tizen.org/privilege/display</privilege>
-        <privilege>http://tizen.org/privilege/keygrab</privilege>
+        <privilege>http://tizen.org/privilege/message.read</privilege>
     </privileges>
 </manifest>

diff --git a/ucl/inc/ucl/gui/Theme.h b/ucl/inc/ucl/gui/Theme.h
index f82d675f94d688e3de7c005a73c080fc8659e253..d8b5b315d217029a84f0f9dd93d562a55ab394f9 100644 (file)
--- a/ucl/inc/ucl/gui/Theme.h
+++ b/ucl/inc/ucl/gui/Theme.h
@@ -29,7 +29,7 @@ namespace ucl {
 
        public:
                Theme();
-               Theme(nullptr_t);
+               Theme(std::nullptr_t);
                explicit Theme(Elm_Theme *th, bool isOwner = false);
                Theme(Theme &&tmp);
                Theme &operator=(Theme &&tmp);

diff --git a/ucl/inc/ucl/gui/Theme.hpp b/ucl/inc/ucl/gui/Theme.hpp
index dac1d5763ff28a1ed2b7abc8e42bbdfb11d6d026..65910df3f8912092573f796dd39e35888f176177 100644 (file)
--- a/ucl/inc/ucl/gui/Theme.hpp
+++ b/ucl/inc/ucl/gui/Theme.hpp
@@ -31,7 +31,7 @@ namespace ucl {
        {
        }
 
-       inline Theme::Theme(nullptr_t) :
+       inline Theme::Theme(std::nullptr_t) :
                Theme()
        {
        }

diff --git a/ucl/inc/ucl/gui/WidgetItem.h b/ucl/inc/ucl/gui/WidgetItem.h
index edef5e935a446ef42eb250de563ec17e526ef74a..7794444163953b75751a1e35251b3039e759ee47 100644 (file)
--- a/ucl/inc/ucl/gui/WidgetItem.h
+++ b/ucl/inc/ucl/gui/WidgetItem.h
@@ -24,7 +24,7 @@ namespace ucl {
        class WidgetItem {
        public:
                constexpr WidgetItem();
-               constexpr WidgetItem(nullptr_t);
+               constexpr WidgetItem(std::nullptr_t);
                explicit WidgetItem(Elm_Object_Item *it);
 
                Elm_Object_Item *getIt() const;

diff --git a/ucl/inc/ucl/gui/WidgetItem.hpp b/ucl/inc/ucl/gui/WidgetItem.hpp
index 9880816cbb53751f00a999cb60b503a2a5f61d3d..26b6cbda19b5496d8985dcd41baefae9655d2887 100644 (file)
--- a/ucl/inc/ucl/gui/WidgetItem.hpp
+++ b/ucl/inc/ucl/gui/WidgetItem.hpp
@@ -21,7 +21,7 @@ namespace ucl {
        {
        }
 
-       constexpr WidgetItem::WidgetItem(nullptr_t) :
+       constexpr WidgetItem::WidgetItem(std::nullptr_t) :
                WidgetItem()
        {
        }

diff --git a/ucl/inc/ucl/gui/types.h b/ucl/inc/ucl/gui/types.h
index ed7d03f9f61f9fbf17c363b984bb1c16c516644c..f4deb132e40ff8f3a2d79aae22ce79857ed3077d 100644 (file)
--- a/ucl/inc/ucl/gui/types.h
+++ b/ucl/inc/ucl/gui/types.h
@@ -105,7 +105,7 @@ namespace ucl {
                const char *style;
 
                constexpr LayoutTheme();
-               constexpr LayoutTheme(nullptr_t);
+               constexpr LayoutTheme(std::nullptr_t);
                constexpr LayoutTheme(const char *klass,
                                const char *group, const char *style);
        };

diff --git a/ucl/inc/ucl/gui/types.hpp b/ucl/inc/ucl/gui/types.hpp
index 95521a239be4b6bde41adef12225b6b7c2bb8197..7f128c89ad8b8f55f5045948fcebad83713abeeb 100644 (file)
--- a/ucl/inc/ucl/gui/types.hpp
+++ b/ucl/inc/ucl/gui/types.hpp
@@ -27,7 +27,7 @@ namespace ucl {
        {
        }
 
-       constexpr LayoutTheme::LayoutTheme(nullptr_t) :
+       constexpr LayoutTheme::LayoutTheme(std::nullptr_t) :
                LayoutTheme()
        {
        }

diff --git a/ucl/inc/ucl/misc/Aspect.h b/ucl/inc/ucl/misc/Aspect.h
index 9b40f98f5de03720a2f033d9e8aedda89b42b9dd..082cd91164b46123776f9c1b4193de8c855a1028 100644 (file)
--- a/ucl/inc/ucl/misc/Aspect.h
+++ b/ucl/inc/ucl/misc/Aspect.h
@@ -26,7 +26,7 @@ namespace ucl {
                const char *name;
 
                constexpr Aspect();
-               constexpr Aspect(nullptr_t);
+               constexpr Aspect(std::nullptr_t);
                explicit constexpr Aspect(const char *name);
 
                constexpr operator const char *() const;

diff --git a/ucl/inc/ucl/misc/Aspect.hpp b/ucl/inc/ucl/misc/Aspect.hpp
index 03127ec39f0db70cba6c83e8e5cbecbca1d28b02..aac7ddb05b17d5c1363eedf3d95ad4a8fce4460f 100644 (file)
--- a/ucl/inc/ucl/misc/Aspect.hpp
+++ b/ucl/inc/ucl/misc/Aspect.hpp
@@ -27,7 +27,7 @@ namespace ucl {
        }
 
        template <class CHILD>
-       constexpr Aspect<CHILD>::Aspect(nullptr_t) :
+       constexpr Aspect<CHILD>::Aspect(std::nullptr_t) :
                Aspect()
        {
        }

diff --git a/ucl/inc/ucl/misc/Variant.h b/ucl/inc/ucl/misc/Variant.h
index a69866b1c755897a7a8ca83d438de3fded4e9d33..3bfa6d6ccb3abf23d19d37f7736938bd9714184c 100644 (file)
--- a/ucl/inc/ucl/misc/Variant.h
+++ b/ucl/inc/ucl/misc/Variant.h
@@ -72,7 +72,7 @@ namespace ucl {
 
        public:
                Variant() noexcept;
-               Variant(nullptr_t) noexcept;
+               Variant(std::nullptr_t) noexcept;
 
                Variant(bool aBool) noexcept;
                Variant(int anInt) noexcept;
@@ -83,7 +83,7 @@ namespace ucl {
                Variant(const char *aString, int length);
                Variant(const std::string &aString);
 
-               Variant(nullptr_t, int arrayLength);
+               Variant(std::nullptr_t, int arrayLength);
                Variant(const Variant *anArray, int length);
                Variant(const VarVector &anArray);
                template <size_t N>

diff --git a/ucl/inc/ucl/misc/Variant.hpp b/ucl/inc/ucl/misc/Variant.hpp
index 86ad92eb15b0046bdd1e0c417f12275b87c1ec99..04c66504eb7e98ab2dccc70769476c4188c460c7 100644 (file)
--- a/ucl/inc/ucl/misc/Variant.hpp
+++ b/ucl/inc/ucl/misc/Variant.hpp
@@ -74,7 +74,7 @@ namespace ucl {
        {
        }
 
-       inline Variant::Variant(nullptr_t) noexcept :
+       inline Variant::Variant(std::nullptr_t) noexcept :
                Variant()
        {
        }

diff --git a/ucl/inc/ucl/util/delegation/BaseDelegate.h b/ucl/inc/ucl/util/delegation/BaseDelegate.h
index e49ce22f55f89961da741dceba086a4381c10d2a..d5c518c530b4549eed623419424e8e8f98ea122a 100644 (file)
--- a/ucl/inc/ucl/util/delegation/BaseDelegate.h
+++ b/ucl/inc/ucl/util/delegation/BaseDelegate.h
@@ -35,7 +35,7 @@ namespace ucl {
 
        public:
                constexpr BaseDelegate() noexcept;
-               constexpr BaseDelegate(nullptr_t) noexcept;
+               constexpr BaseDelegate(std::nullptr_t) noexcept;
 
                template <class FUNC_SIG>
                BaseDelegate(const BaseDelegate2<FUNC_SIG, DATA> &d) noexcept;

diff --git a/ucl/inc/ucl/util/delegation/BaseDelegate.hpp b/ucl/inc/ucl/util/delegation/BaseDelegate.hpp
index 9fe436967c0268ec4cb51fb7fad7a0865d8063f3..4cb9741ffefd70116bc2f70f015fce77e6ee564a 100644 (file)
--- a/ucl/inc/ucl/util/delegation/BaseDelegate.hpp
+++ b/ucl/inc/ucl/util/delegation/BaseDelegate.hpp
@@ -25,7 +25,7 @@ namespace ucl {
 
        template <class R, class ...ARGS, class DATA>
        constexpr BaseDelegate<R(ARGS...), DATA>::
-                       BaseDelegate(nullptr_t) noexcept :
+                       BaseDelegate(std::nullptr_t) noexcept :
                BaseDelegate()
        {
        }

diff --git a/ucl/inc/ucl/util/memory/SharedRef.h b/ucl/inc/ucl/util/memory/SharedRef.h
index 9e4793fb18cd773cba6eb3a2b9b8fa5aa45e90ef..4bd7ca0bc3db70f9b1240b7975085c3e02533510 100644 (file)
--- a/ucl/inc/ucl/util/memory/SharedRef.h
+++ b/ucl/inc/ucl/util/memory/SharedRef.h
@@ -34,7 +34,7 @@ namespace ucl {
 
        public:
                constexpr SharedRef() noexcept;
-               constexpr SharedRef(nullptr_t) noexcept;
+               constexpr SharedRef(std::nullptr_t) noexcept;
 
                SharedRef(RefCountObjBase *rc, T *ptr) noexcept;
 

diff --git a/ucl/inc/ucl/util/memory/SharedRef.hpp b/ucl/inc/ucl/util/memory/SharedRef.hpp
index d6b4ee6de694b3f9d81ac9f1a656c3f159c6f327..5b5ad55c64c9b055322f3838857288ec488f3f76 100644 (file)
--- a/ucl/inc/ucl/util/memory/SharedRef.hpp
+++ b/ucl/inc/ucl/util/memory/SharedRef.hpp
@@ -24,7 +24,7 @@ namespace ucl {
        }
 
        template <class T>
-       constexpr SharedRef<T>::SharedRef(nullptr_t) noexcept
+       constexpr SharedRef<T>::SharedRef(std::nullptr_t) noexcept
        {
        }
 

diff --git a/ucl/inc/ucl/util/memory/WeakRef.h b/ucl/inc/ucl/util/memory/WeakRef.h
index c8edef45230f772b43c0b8bb66d427e0d080ad8e..78450a51f2ab78cebe7a0ffe764046b019ce362e 100644 (file)
--- a/ucl/inc/ucl/util/memory/WeakRef.h
+++ b/ucl/inc/ucl/util/memory/WeakRef.h
@@ -34,7 +34,7 @@ namespace ucl {
 
        public:
                constexpr WeakRef() noexcept;
-               constexpr WeakRef(nullptr_t) noexcept;
+               constexpr WeakRef(std::nullptr_t) noexcept;
 
                WeakRef(RefCountObjBase *rc, T *ptr) noexcept;
 

diff --git a/ucl/inc/ucl/util/memory/WeakRef.hpp b/ucl/inc/ucl/util/memory/WeakRef.hpp
index 750881576f869154c17d2cf7aadc6cba610376e7..b1681ed662ffbb93b6a3b4504e1755816e7db60a 100644 (file)
--- a/ucl/inc/ucl/util/memory/WeakRef.hpp
+++ b/ucl/inc/ucl/util/memory/WeakRef.hpp
@@ -22,7 +22,7 @@ namespace ucl {
        }
 
        template <class T>
-       constexpr WeakRef<T>::WeakRef(nullptr_t) noexcept
+       constexpr WeakRef<T>::WeakRef(std::nullptr_t) noexcept
        {
        }
 

diff --git a/ucl/inc/ucl/util/memory/helpers.h b/ucl/inc/ucl/util/memory/helpers.h
index ad785916119801ad9b77363873e20903c9c0ffd7..4e6c0e0ee7a6ebc77299d7860199e839ecce6754 100644 (file)
--- a/ucl/inc/ucl/util/memory/helpers.h
+++ b/ucl/inc/ucl/util/memory/helpers.h
@@ -87,28 +87,28 @@ namespace ucl {
 
        template <class T, class = typename std::enable_if<
                std::is_base_of<BaseRef<typename T::Type>, T>::value>::type>
-       inline bool operator==(const T &lhs, nullptr_t rhs) noexcept
+       inline bool operator==(const T &lhs, std::nullptr_t rhs) noexcept
        {
                return !lhs;
        }
 
        template <class T, class = typename std::enable_if<
                std::is_base_of<BaseRef<typename T::Type>, T>::value>::type>
-       bool operator==(nullptr_t lhs, const T &rhs) noexcept
+       bool operator==(std::nullptr_t lhs, const T &rhs) noexcept
        {
                return !rhs;
        }
 
        template <class T, class = typename std::enable_if<
                std::is_base_of<BaseRef<typename T::Type>, T>::value>::type>
-       bool operator!=(const T &lhs, nullptr_t rhs) noexcept
+       bool operator!=(const T &lhs, std::nullptr_t rhs) noexcept
        {
                return lhs;
        }
 
        template <class T, class = typename std::enable_if<
                std::is_base_of<BaseRef<typename T::Type>, T>::value>::type>
-       bool operator!=(nullptr_t lhs, const T &rhs) noexcept
+       bool operator!=(std::nullptr_t lhs, const T &rhs) noexcept
        {
                return rhs;
        }

diff --git a/ucl/src/misc/Variant.cpp b/ucl/src/misc/Variant.cpp
index 3859bc5f4e37edfed2a3372bd6aba65d086c3903..4509118fd27c2387c981d566215d4975fe3847f2 100644 (file)
--- a/ucl/src/misc/Variant.cpp
+++ b/ucl/src/misc/Variant.cpp
@@ -38,7 +38,7 @@ namespace ucl {
                }
        }
 
-       Variant::Variant(nullptr_t, const int arrayLength) :
+       Variant::Variant(std::nullptr_t, const int arrayLength) :
                m_type(static_cast<int>((arrayLength > 0) ? TYPE_ARRAY : TYPE_NIL))
        {
                if (arrayLength > 0) {