From: maneesha <maneesha.k@samsung.com>
Date: Tue, 29 Aug 2017 08:28:11 +0000 (+0530)
Subject: [TBT][Non-ACR][DPTTIZEN-2914,Adding Test Case for Motion Detectio APIs]
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F33%2F146533%2F4;p=test%2Ftct%2Fnative%2Fbehavior.git

[TBT][Non-ACR][DPTTIZEN-2914,Adding Test Case for Motion Detectio APIs]

Change-Id: I08b784aeabe01cc19e8118e6c86b42ccc827f660
Signed-off-by: maneesha <maneesha.k@samsung.com>
---

diff --git a/coretbtdataprovider/.cproject b/coretbtdataprovider/.cproject
index 92a2951..03ecf6d 100644
--- a/coretbtdataprovider/.cproject
+++ b/coretbtdataprovider/.cproject
@@ -16,7 +16,7 @@
 				</extensions>
 			</storageModule>
 			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-				<configuration artifactName="coretbt_dataprovider" 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.1085126093" name="Debug" parent="org.tizen.nativecore.config.sbi.gcc45.app.debug">
+				<configuration artifactName="coretbtdataprovider" 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.1085126093" name="Debug" parent="org.tizen.nativecore.config.sbi.gcc45.app.debug">
 					<folderInfo id="org.tizen.nativecore.config.sbi.gcc45.app.debug.1085126093." name="/" resourcePath="">
 						<toolChain id="org.tizen.nativecore.toolchain.sbi.gcc45.app.debug.2050445968" 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.1371100226" osList="linux,win32" superClass="org.tizen.nativeide.target.sbi.gnu.platform.base"/>
@@ -27,11 +27,12 @@
 								<option defaultValue="gnu.cpp.compiler.debugging.level.max" id="sbi.gnu.cpp.compiler.option.debugging.level.core.3454285" 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.1158849312" name="-fPIC option" superClass="sbi.gnu.cpp.compiler.option.misc.pic.core" valueType="boolean"/>
 								<option id="sbi.gnu.cpp.compiler.option.488726976" name="Tizen-Target" superClass="sbi.gnu.cpp.compiler.option" valueType="userObjs">
-									<listOptionValue builtIn="false" value="wearable-4.0-emulator.core.public.20170520_1_llvm37.i386.core.app"/>
+									<listOptionValue builtIn="false" value="wearable-4.0-emulator.core_llvm37.i386.core.app"/>
 								</option>
 								<option id="sbi.gnu.cpp.compiler.option.frameworks_inc.core.1268472573" 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-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;"/>
@@ -99,7 +100,6 @@
 									<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/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;"/>
@@ -133,11 +133,12 @@
 								<option defaultValue="gnu.c.debugging.level.max" id="sbi.gnu.c.compiler.option.debugging.level.core.1326340005" 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.703782502" name="-fPIC option" superClass="sbi.gnu.c.compiler.option.misc.pic.core" valueType="boolean"/>
 								<option id="sbi.gnu.c.compiler.option.607246979" name="Tizen-Target" superClass="sbi.gnu.c.compiler.option" valueType="userObjs">
-									<listOptionValue builtIn="false" value="wearable-4.0-emulator.core.public.20170520_1_llvm37.i386.core.app"/>
+									<listOptionValue builtIn="false" value="wearable-4.0-emulator.core_llvm37.i386.core.app"/>
 								</option>
 								<option id="sbi.gnu.c.compiler.option.frameworks_inc.core.573934016" 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-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;"/>
@@ -205,7 +206,6 @@
 									<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/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;"/>
diff --git a/coretbtserviceapp/.cproject b/coretbtserviceapp/.cproject
index 3c4bee8..de1ca40 100644
--- a/coretbtserviceapp/.cproject
+++ b/coretbtserviceapp/.cproject
@@ -16,7 +16,7 @@
 				</extensions>
 			</storageModule>
 			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-				<configuration artifactName="coretbt_serviceapp" 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.641941649" name="Debug" parent="org.tizen.nativecore.config.sbi.gcc45.app.debug">
+				<configuration artifactName="coretbtserviceapp" 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.641941649" name="Debug" parent="org.tizen.nativecore.config.sbi.gcc45.app.debug">
 					<folderInfo id="org.tizen.nativecore.config.sbi.gcc45.app.debug.641941649." name="/" resourcePath="">
 						<toolChain id="org.tizen.nativecore.toolchain.sbi.gcc45.app.debug.1501737702" 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.1097668729" osList="linux,win32" superClass="org.tizen.nativeide.target.sbi.gnu.platform.base"/>
@@ -27,11 +27,12 @@
 								<option defaultValue="gnu.cpp.compiler.debugging.level.max" id="sbi.gnu.cpp.compiler.option.debugging.level.core.1731725760" 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.1265465681" name="-fPIC option" superClass="sbi.gnu.cpp.compiler.option.misc.pic.core" valueType="boolean"/>
 								<option id="sbi.gnu.cpp.compiler.option.954504427" name="Tizen-Target" superClass="sbi.gnu.cpp.compiler.option" valueType="userObjs">
-									<listOptionValue builtIn="false" value="wearable-4.0-emulator.core.public.20170520_1_llvm37.i386.core.app"/>
+									<listOptionValue builtIn="false" value="wearable-4.0-emulator.core_llvm37.i386.core.app"/>
 								</option>
 								<option id="sbi.gnu.cpp.compiler.option.frameworks_inc.core.620741475" 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-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;"/>
@@ -99,7 +100,6 @@
 									<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/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;"/>
@@ -133,11 +133,12 @@
 								<option defaultValue="gnu.c.debugging.level.max" id="sbi.gnu.c.compiler.option.debugging.level.core.1504548236" 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.1331934720" name="-fPIC option" superClass="sbi.gnu.c.compiler.option.misc.pic.core" valueType="boolean"/>
 								<option id="sbi.gnu.c.compiler.option.1260943742" name="Tizen-Target" superClass="sbi.gnu.c.compiler.option" valueType="userObjs">
-									<listOptionValue builtIn="false" value="wearable-4.0-emulator.core.public.20170520_1_llvm37.i386.core.app"/>
+									<listOptionValue builtIn="false" value="wearable-4.0-emulator.core_llvm37.i386.core.app"/>
 								</option>
 								<option id="sbi.gnu.c.compiler.option.frameworks_inc.core.1258163840" 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-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;"/>
@@ -205,7 +206,6 @@
 									<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/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;"/>
diff --git a/coretbtuiapp/.cproject b/coretbtuiapp/.cproject
index 41dd1d8..abe2c2e 100644
--- a/coretbtuiapp/.cproject
+++ b/coretbtuiapp/.cproject
@@ -16,7 +16,7 @@
 				</extensions>
 			</storageModule>
 			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-				<configuration artifactName="coretbt_uiapp" 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.1116111270" name="Debug" parent="org.tizen.nativecore.config.sbi.gcc45.app.debug">
+				<configuration artifactName="coretbtuiapp" 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.1116111270" name="Debug" parent="org.tizen.nativecore.config.sbi.gcc45.app.debug">
 					<folderInfo id="org.tizen.nativecore.config.sbi.gcc45.app.debug.1116111270." name="/" resourcePath="">
 						<toolChain id="org.tizen.nativecore.toolchain.sbi.gcc45.app.debug.1713868802" 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.944841896" osList="linux,win32" superClass="org.tizen.nativeide.target.sbi.gnu.platform.base"/>
@@ -26,11 +26,12 @@
 								<option id="gnu.cpp.compiler.option.optimization.level.711550912" name="Optimization Level" superClass="gnu.cpp.compiler.option.optimization.level" value="gnu.cpp.compiler.optimization.level.none" valueType="enumerated"/>
 								<option defaultValue="gnu.cpp.compiler.debugging.level.max" id="sbi.gnu.cpp.compiler.option.debugging.level.core.438877114" name="Debug level" superClass="sbi.gnu.cpp.compiler.option.debugging.level.core" valueType="enumerated"/>
 								<option id="sbi.gnu.cpp.compiler.option.1475268326" name="Tizen-Target" superClass="sbi.gnu.cpp.compiler.option" valueType="userObjs">
-									<listOptionValue builtIn="false" value="wearable-4.0-emulator.core.public.20170520_1_llvm37.i386.core.app"/>
+									<listOptionValue builtIn="false" value="wearable-4.0-emulator.core_llvm37.i386.core.app"/>
 								</option>
 								<option id="sbi.gnu.cpp.compiler.option.frameworks_inc.core.464409521" 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-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;"/>
@@ -98,7 +99,6 @@
 									<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/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;"/>
@@ -131,11 +131,12 @@
 								<option defaultValue="gnu.c.optimization.level.none" id="gnu.c.compiler.option.optimization.level.1957458613" name="Optimization Level" superClass="gnu.c.compiler.option.optimization.level" valueType="enumerated"/>
 								<option defaultValue="gnu.c.debugging.level.max" id="sbi.gnu.c.compiler.option.debugging.level.core.1870236682" name="Debug level" superClass="sbi.gnu.c.compiler.option.debugging.level.core" valueType="enumerated"/>
 								<option id="sbi.gnu.c.compiler.option.1114203792" name="Tizen-Target" superClass="sbi.gnu.c.compiler.option" valueType="userObjs">
-									<listOptionValue builtIn="false" value="wearable-4.0-emulator.core.public.20170520_1_llvm37.i386.core.app"/>
+									<listOptionValue builtIn="false" value="wearable-4.0-emulator.core_llvm37.i386.core.app"/>
 								</option>
 								<option id="sbi.gnu.c.compiler.option.frameworks_inc.core.20692689" 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-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;"/>
@@ -203,7 +204,6 @@
 									<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/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;"/>
diff --git a/coretbtwidgetapp/.cproject b/coretbtwidgetapp/.cproject
index f7c0b4d..3e7764f 100644
--- a/coretbtwidgetapp/.cproject
+++ b/coretbtwidgetapp/.cproject
@@ -26,11 +26,12 @@
 								<option id="gnu.cpp.compiler.option.optimization.level.532662713" name="Optimization Level" superClass="gnu.cpp.compiler.option.optimization.level" value="gnu.cpp.compiler.optimization.level.none" valueType="enumerated"/>
 								<option id="sbi.gnu.cpp.compiler.option.debugging.level.core.464392883" name="Debug level" superClass="sbi.gnu.cpp.compiler.option.debugging.level.core" value="gnu.cpp.compiler.debugging.level.max" valueType="enumerated"/>
 								<option id="sbi.gnu.cpp.compiler.option.1832722674" name="Tizen-Target" superClass="sbi.gnu.cpp.compiler.option" valueType="userObjs">
-									<listOptionValue builtIn="false" value="wearable-4.0-device.core.public.20170520_1_llvm37.armel.core.app"/>
+									<listOptionValue builtIn="false" value="wearable-4.0-emulator.core_llvm37.i386.core.app"/>
 								</option>
 								<option id="sbi.gnu.cpp.compiler.option.frameworks_inc.core.399088966" 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-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;"/>
@@ -98,7 +99,6 @@
 									<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/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;"/>
@@ -118,7 +118,6 @@
 									<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.325907324" name="Include paths (-I)" superClass="gnu.cpp.compiler.option.include.paths" valueType="includePath">
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/inc}&quot;"/>
@@ -135,11 +134,12 @@
 								<option defaultValue="gnu.c.optimization.level.none" id="gnu.c.compiler.option.optimization.level.148972603" name="Optimization Level" superClass="gnu.c.compiler.option.optimization.level" valueType="enumerated"/>
 								<option id="sbi.gnu.c.compiler.option.debugging.level.core.769220405" name="Debug level" superClass="sbi.gnu.c.compiler.option.debugging.level.core" value="gnu.c.debugging.level.max" valueType="enumerated"/>
 								<option id="sbi.gnu.c.compiler.option.1233452326" name="Tizen-Target" superClass="sbi.gnu.c.compiler.option" valueType="userObjs">
-									<listOptionValue builtIn="false" value="wearable-4.0-device.core.public.20170520_1_llvm37.armel.core.app"/>
+									<listOptionValue builtIn="false" value="wearable-4.0-emulator.core_llvm37.i386.core.app"/>
 								</option>
 								<option id="sbi.gnu.c.compiler.option.frameworks_inc.core.1904458450" 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-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;"/>
@@ -207,7 +207,6 @@
 									<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/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;"/>
@@ -227,7 +226,6 @@
 									<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.1491061218" name="Include paths (-I)" superClass="gnu.c.compiler.option.include.paths" valueType="includePath">
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/inc}&quot;"/>
@@ -259,7 +257,7 @@
 									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
 								</inputType>
 							</tool>
-							<tool command="arm-linux-gnueabi-as" id="org.tizen.nativeapp.tool.sbi.gnu.assembler.base.1480776232" name="Assembler" superClass="org.tizen.nativeapp.tool.sbi.gnu.assembler.base">
+							<tool command="i386-linux-gnueabi-as" id="org.tizen.nativeapp.tool.sbi.gnu.assembler.base.1480776232" name="Assembler" superClass="org.tizen.nativeapp.tool.sbi.gnu.assembler.base">
 								<inputType id="cdt.managedbuild.tool.gnu.assembler.input.1502601955" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
 							</tool>
 							<tool id="org.tizen.nativecore.tool.fnmapgen.879161079" name="C FN-Map Generator" superClass="org.tizen.nativecore.tool.fnmapgen"/>
diff --git a/operationpickviewapp/.cproject b/operationpickviewapp/.cproject
index 779a648..882744d 100644
--- a/operationpickviewapp/.cproject
+++ b/operationpickviewapp/.cproject
@@ -26,11 +26,12 @@
 								<option id="gnu.cpp.compiler.option.optimization.level.909214708" name="Optimization Level" superClass="gnu.cpp.compiler.option.optimization.level" value="gnu.cpp.compiler.optimization.level.none" valueType="enumerated"/>
 								<option defaultValue="gnu.cpp.compiler.debugging.level.max" id="sbi.gnu.cpp.compiler.option.debugging.level.core.17442777" name="Debug level" superClass="sbi.gnu.cpp.compiler.option.debugging.level.core" valueType="enumerated"/>
 								<option id="sbi.gnu.cpp.compiler.option.435286799" name="Tizen-Target" superClass="sbi.gnu.cpp.compiler.option" valueType="userObjs">
-									<listOptionValue builtIn="false" value="wearable-4.0-emulator.core.public.20170520_1_llvm37.i386.core.app"/>
+									<listOptionValue builtIn="false" value="wearable-4.0-emulator.core_llvm37.i386.core.app"/>
 								</option>
 								<option id="sbi.gnu.cpp.compiler.option.frameworks_inc.core.140915077" 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-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;"/>
@@ -98,7 +99,6 @@
 									<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/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;"/>
@@ -131,11 +131,12 @@
 								<option defaultValue="gnu.c.optimization.level.none" id="gnu.c.compiler.option.optimization.level.171896184" name="Optimization Level" superClass="gnu.c.compiler.option.optimization.level" valueType="enumerated"/>
 								<option defaultValue="gnu.c.debugging.level.max" id="sbi.gnu.c.compiler.option.debugging.level.core.113948260" name="Debug level" superClass="sbi.gnu.c.compiler.option.debugging.level.core" valueType="enumerated"/>
 								<option id="sbi.gnu.c.compiler.option.456139409" name="Tizen-Target" superClass="sbi.gnu.c.compiler.option" valueType="userObjs">
-									<listOptionValue builtIn="false" value="wearable-4.0-emulator.core.public.20170520_1_llvm37.i386.core.app"/>
+									<listOptionValue builtIn="false" value="wearable-4.0-emulator.core_llvm37.i386.core.app"/>
 								</option>
 								<option id="sbi.gnu.c.compiler.option.frameworks_inc.core.1771289066" 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-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;"/>
@@ -203,7 +204,6 @@
 									<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/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;"/>
diff --git a/release/binary-armv7l/org.tizen.tbtcoreapp-1.0.0-arm.tpk b/release/binary-armv7l/org.tizen.tbtcoreapp-1.0.0-arm.tpk
old mode 100755
new mode 100644
index 1b4789b..67db170
Binary files a/release/binary-armv7l/org.tizen.tbtcoreapp-1.0.0-arm.tpk and b/release/binary-armv7l/org.tizen.tbtcoreapp-1.0.0-arm.tpk differ
diff --git a/release/binary-x86/org.tizen.tbtcoreapp-1.0.0-x86.tpk b/release/binary-x86/org.tizen.tbtcoreapp-1.0.0-x86.tpk
old mode 100755
new mode 100644
index b9fba3c..d730962
Binary files a/release/binary-x86/org.tizen.tbtcoreapp-1.0.0-x86.tpk and b/release/binary-x86/org.tizen.tbtcoreapp-1.0.0-x86.tpk differ
diff --git a/tbt-ime/.cproject b/tbt-ime/.cproject
index f37b25d..ed7cab1 100644
--- a/tbt-ime/.cproject
+++ b/tbt-ime/.cproject
@@ -27,11 +27,12 @@
 								<option id="sbi.gnu.cpp.compiler.option.debugging.level.core.1231851100" name="Debug level" superClass="sbi.gnu.cpp.compiler.option.debugging.level.core" value="gnu.cpp.compiler.debugging.level.max" valueType="enumerated"/>
 								<option defaultValue="true" id="sbi.gnu.cpp.compiler.option.misc.pic.core.1763196665" name="-fPIC option" superClass="sbi.gnu.cpp.compiler.option.misc.pic.core" valueType="boolean"/>
 								<option id="sbi.gnu.cpp.compiler.option.1689755584" name="Tizen-Target" superClass="sbi.gnu.cpp.compiler.option" valueType="userObjs">
-									<listOptionValue builtIn="false" value="wearable-4.0-emulator.core.public.20170520_1_llvm37.armel.core.sharedLib"/>
+									<listOptionValue builtIn="false" value="wearable-4.0-emulator.core_llvm37.i386.core.app"/>
 								</option>
 								<option id="sbi.gnu.cpp.compiler.option.frameworks_inc.core.1706368261" 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-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;"/>
@@ -99,7 +100,6 @@
 									<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/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;"/>
@@ -118,7 +118,6 @@
 									<listOptionValue builtIn="false" value="${TC_COMPILER_MISC}"/>
 									<listOptionValue builtIn="false" value="${RS_COMPILER_MISC}"/>
 									<listOptionValue builtIn="false" value="--sysroot=&quot;${SBI_SYSROOT}&quot;"/>
-									<listOptionValue builtIn="false" value="-mthumb"/>
 									<listOptionValue builtIn="false" value="-fvisibility=hidden"/>
 								</option>
 								<option id="gnu.cpp.compiler.option.include.paths.1468097797" name="Include paths (-I)" superClass="gnu.cpp.compiler.option.include.paths" valueType="includePath">
@@ -137,11 +136,12 @@
 								<option id="sbi.gnu.c.compiler.option.debugging.level.core.1051846740" name="Debug level" superClass="sbi.gnu.c.compiler.option.debugging.level.core" value="gnu.c.debugging.level.max" valueType="enumerated"/>
 								<option defaultValue="true" id="sbi.gnu.c.compiler.option.misc.pic.core.1573758691" name="-fPIC option" superClass="sbi.gnu.c.compiler.option.misc.pic.core" valueType="boolean"/>
 								<option id="sbi.gnu.c.compiler.option.1413966887" name="Tizen-Target" superClass="sbi.gnu.c.compiler.option" valueType="userObjs">
-									<listOptionValue builtIn="false" value="wearable-4.0-emulator.core.public.20170520_1_llvm37.armel.core.sharedLib"/>
+									<listOptionValue builtIn="false" value="wearable-4.0-emulator.core_llvm37.i386.core.app"/>
 								</option>
 								<option id="sbi.gnu.c.compiler.option.frameworks_inc.core.1117277018" 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-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;"/>
@@ -209,7 +209,6 @@
 									<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/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;"/>
@@ -228,7 +227,6 @@
 									<listOptionValue builtIn="false" value="${TC_COMPILER_MISC}"/>
 									<listOptionValue builtIn="false" value="${RS_COMPILER_MISC}"/>
 									<listOptionValue builtIn="false" value="--sysroot=&quot;${SBI_SYSROOT}&quot;"/>
-									<listOptionValue builtIn="false" value="-mthumb"/>
 									<listOptionValue builtIn="false" value="-fvisibility=hidden"/>
 								</option>
 								<option id="gnu.c.compiler.option.include.paths.354937304" name="Include paths (-I)" superClass="gnu.c.compiler.option.include.paths" valueType="includePath">
@@ -261,7 +259,7 @@
 									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
 								</inputType>
 							</tool>
-							<tool command="arm-linux-gnueabi-as" id="org.tizen.nativeapp.tool.sbi.gnu.assembler.base.935975851" name="Assembler" superClass="org.tizen.nativeapp.tool.sbi.gnu.assembler.base">
+							<tool command="i386-linux-gnueabi-as" id="org.tizen.nativeapp.tool.sbi.gnu.assembler.base.935975851" name="Assembler" superClass="org.tizen.nativeapp.tool.sbi.gnu.assembler.base">
 								<inputType id="cdt.managedbuild.tool.gnu.assembler.input.571718939" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
 							</tool>
 							<tool id="org.tizen.nativecore.tool.fnmapgen.1633586894" name="C FN-Map Generator" superClass="org.tizen.nativecore.tool.fnmapgen"/>
diff --git a/tbt_hcetestappA/.cproject b/tbt_hcetestappA/.cproject
index 35b314e..f854ec3 100644
--- a/tbt_hcetestappA/.cproject
+++ b/tbt_hcetestappA/.cproject
@@ -27,11 +27,12 @@
 								<option defaultValue="gnu.cpp.compiler.debugging.level.max" id="sbi.gnu.cpp.compiler.option.debugging.level.core.1541711486" 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.1844956764" name="-fPIC option" superClass="sbi.gnu.cpp.compiler.option.misc.pic.core" valueType="boolean"/>
 								<option id="sbi.gnu.cpp.compiler.option.617138083" name="Tizen-Target" superClass="sbi.gnu.cpp.compiler.option" valueType="userObjs">
-									<listOptionValue builtIn="false" value="wearable-4.0-emulator.core.public.20170520_1_llvm37.i386.core.app"/>
+									<listOptionValue builtIn="false" value="wearable-4.0-emulator.core_llvm37.i386.core.app"/>
 								</option>
 								<option id="sbi.gnu.cpp.compiler.option.frameworks_inc.core.1487326881" 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-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;"/>
@@ -99,7 +100,6 @@
 									<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/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;"/>
@@ -133,11 +133,12 @@
 								<option defaultValue="gnu.c.debugging.level.max" id="sbi.gnu.c.compiler.option.debugging.level.core.263897482" 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.266720625" name="-fPIC option" superClass="sbi.gnu.c.compiler.option.misc.pic.core" valueType="boolean"/>
 								<option id="sbi.gnu.c.compiler.option.1011614974" name="Tizen-Target" superClass="sbi.gnu.c.compiler.option" valueType="userObjs">
-									<listOptionValue builtIn="false" value="wearable-4.0-emulator.core.public.20170520_1_llvm37.i386.core.app"/>
+									<listOptionValue builtIn="false" value="wearable-4.0-emulator.core_llvm37.i386.core.app"/>
 								</option>
 								<option id="sbi.gnu.c.compiler.option.frameworks_inc.core.421933235" 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-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;"/>
@@ -205,7 +206,6 @@
 									<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/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;"/>
diff --git a/tbt_hcetestappB/.cproject b/tbt_hcetestappB/.cproject
index 834f6ff..4e300ae 100644
--- a/tbt_hcetestappB/.cproject
+++ b/tbt_hcetestappB/.cproject
@@ -27,11 +27,12 @@
 								<option defaultValue="gnu.cpp.compiler.debugging.level.max" id="sbi.gnu.cpp.compiler.option.debugging.level.core.2013007432" 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.815451087" name="-fPIC option" superClass="sbi.gnu.cpp.compiler.option.misc.pic.core" valueType="boolean"/>
 								<option id="sbi.gnu.cpp.compiler.option.2070778652" name="Tizen-Target" superClass="sbi.gnu.cpp.compiler.option" valueType="userObjs">
-									<listOptionValue builtIn="false" value="wearable-4.0-emulator.core.public.20170520_1_llvm37.i386.core.app"/>
+									<listOptionValue builtIn="false" value="wearable-4.0-emulator.core_llvm37.i386.core.app"/>
 								</option>
 								<option id="sbi.gnu.cpp.compiler.option.frameworks_inc.core.856688180" 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-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;"/>
@@ -99,7 +100,6 @@
 									<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/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;"/>
@@ -133,11 +133,12 @@
 								<option defaultValue="gnu.c.debugging.level.max" id="sbi.gnu.c.compiler.option.debugging.level.core.1781461967" 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.1099738326" name="-fPIC option" superClass="sbi.gnu.c.compiler.option.misc.pic.core" valueType="boolean"/>
 								<option id="sbi.gnu.c.compiler.option.858236733" name="Tizen-Target" superClass="sbi.gnu.c.compiler.option" valueType="userObjs">
-									<listOptionValue builtIn="false" value="wearable-4.0-emulator.core.public.20170520_1_llvm37.i386.core.app"/>
+									<listOptionValue builtIn="false" value="wearable-4.0-emulator.core_llvm37.i386.core.app"/>
 								</option>
 								<option id="sbi.gnu.c.compiler.option.frameworks_inc.core.288104051" 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-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;"/>
@@ -205,7 +206,6 @@
 									<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/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;"/>
diff --git a/tbt_nfcesetestapp/.cproject b/tbt_nfcesetestapp/.cproject
index 26ac36f..e6e0bd7 100644
--- a/tbt_nfcesetestapp/.cproject
+++ b/tbt_nfcesetestapp/.cproject
@@ -27,11 +27,12 @@
 								<option defaultValue="gnu.cpp.compiler.debugging.level.max" id="sbi.gnu.cpp.compiler.option.debugging.level.core.1610875750" 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.411471338" name="-fPIC option" superClass="sbi.gnu.cpp.compiler.option.misc.pic.core" valueType="boolean"/>
 								<option id="sbi.gnu.cpp.compiler.option.1431149974" name="Tizen-Target" superClass="sbi.gnu.cpp.compiler.option" valueType="userObjs">
-									<listOptionValue builtIn="false" value="wearable-4.0-emulator.core.public.20170520_1_llvm37.i386.core.app"/>
+									<listOptionValue builtIn="false" value="wearable-4.0-emulator.core_llvm37.i386.core.app"/>
 								</option>
 								<option id="sbi.gnu.cpp.compiler.option.frameworks_inc.core.132416470" 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-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;"/>
@@ -99,7 +100,6 @@
 									<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/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;"/>
@@ -133,11 +133,12 @@
 								<option defaultValue="gnu.c.debugging.level.max" id="sbi.gnu.c.compiler.option.debugging.level.core.1836627071" 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.634356917" name="-fPIC option" superClass="sbi.gnu.c.compiler.option.misc.pic.core" valueType="boolean"/>
 								<option id="sbi.gnu.c.compiler.option.608876283" name="Tizen-Target" superClass="sbi.gnu.c.compiler.option" valueType="userObjs">
-									<listOptionValue builtIn="false" value="wearable-4.0-emulator.core.public.20170520_1_llvm37.i386.core.app"/>
+									<listOptionValue builtIn="false" value="wearable-4.0-emulator.core_llvm37.i386.core.app"/>
 								</option>
 								<option id="sbi.gnu.c.compiler.option.frameworks_inc.core.1580231230" 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-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;"/>
@@ -205,7 +206,6 @@
 									<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/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;"/>
diff --git a/tbt_smartcardtestapp/.cproject b/tbt_smartcardtestapp/.cproject
index c89204f..8bbff87 100755
--- a/tbt_smartcardtestapp/.cproject
+++ b/tbt_smartcardtestapp/.cproject
@@ -16,7 +16,7 @@
 				</extensions>
 			</storageModule>
 			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-				<configuration artifactName="smartcardactestapp" 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.921183566" name="Debug" parent="org.tizen.nativecore.config.sbi.gcc45.app.debug">
+				<configuration artifactName="tbt_smartcardtestapp" 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.921183566" name="Debug" parent="org.tizen.nativecore.config.sbi.gcc45.app.debug">
 					<folderInfo id="org.tizen.nativecore.config.sbi.gcc45.app.debug.921183566." name="/" resourcePath="">
 						<toolChain id="org.tizen.nativecore.toolchain.sbi.gcc45.app.debug.61120583" 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.1429500602" osList="linux,win32" superClass="org.tizen.nativeide.target.sbi.gnu.platform.base"/>
@@ -27,11 +27,12 @@
 								<option defaultValue="gnu.cpp.compiler.debugging.level.max" id="sbi.gnu.cpp.compiler.option.debugging.level.core.982120698" 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.432497958" name="-fPIC option" superClass="sbi.gnu.cpp.compiler.option.misc.pic.core" valueType="boolean"/>
 								<option id="sbi.gnu.cpp.compiler.option.212780968" name="Tizen-Target" superClass="sbi.gnu.cpp.compiler.option" valueType="userObjs">
-									<listOptionValue builtIn="false" value="wearable-4.0-emulator.core.public.20170520_1_llvm37.i386.core.app"/>
+									<listOptionValue builtIn="false" value="wearable-4.0-emulator.core_llvm37.i386.core.app"/>
 								</option>
 								<option id="sbi.gnu.cpp.compiler.option.frameworks_inc.core.203430937" 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-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;"/>
@@ -99,7 +100,6 @@
 									<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/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;"/>
@@ -133,11 +133,12 @@
 								<option defaultValue="gnu.c.debugging.level.max" id="sbi.gnu.c.compiler.option.debugging.level.core.1485403507" 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.366720373" name="-fPIC option" superClass="sbi.gnu.c.compiler.option.misc.pic.core" valueType="boolean"/>
 								<option id="sbi.gnu.c.compiler.option.225868252" name="Tizen-Target" superClass="sbi.gnu.c.compiler.option" valueType="userObjs">
-									<listOptionValue builtIn="false" value="wearable-4.0-emulator.core.public.20170520_1_llvm37.i386.core.app"/>
+									<listOptionValue builtIn="false" value="wearable-4.0-emulator.core_llvm37.i386.core.app"/>
 								</option>
 								<option id="sbi.gnu.c.compiler.option.frameworks_inc.core.622559712" 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-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;"/>
@@ -205,7 +206,6 @@
 									<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/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;"/>
diff --git a/tbt_smartcardtestapp_signed/.cproject b/tbt_smartcardtestapp_signed/.cproject
index 5eb95e2..541154a 100755
--- a/tbt_smartcardtestapp_signed/.cproject
+++ b/tbt_smartcardtestapp_signed/.cproject
@@ -16,7 +16,7 @@
 				</extensions>
 			</storageModule>
 			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-				<configuration artifactName="smartcardactestapp_signed" 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.921183566" name="Debug" parent="org.tizen.nativecore.config.sbi.gcc45.app.debug">
+				<configuration artifactName="tbt_smartcardtestapp_signed" 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.921183566" name="Debug" parent="org.tizen.nativecore.config.sbi.gcc45.app.debug">
 					<folderInfo id="org.tizen.nativecore.config.sbi.gcc45.app.debug.921183566." name="/" resourcePath="">
 						<toolChain id="org.tizen.nativecore.toolchain.sbi.gcc45.app.debug.61120583" 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.1429500602" osList="linux,win32" superClass="org.tizen.nativeide.target.sbi.gnu.platform.base"/>
@@ -27,11 +27,12 @@
 								<option defaultValue="gnu.cpp.compiler.debugging.level.max" id="sbi.gnu.cpp.compiler.option.debugging.level.core.982120698" 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.432497958" name="-fPIC option" superClass="sbi.gnu.cpp.compiler.option.misc.pic.core" valueType="boolean"/>
 								<option id="sbi.gnu.cpp.compiler.option.212780968" name="Tizen-Target" superClass="sbi.gnu.cpp.compiler.option" valueType="userObjs">
-									<listOptionValue builtIn="false" value="wearable-4.0-emulator.core.public.20170520_1_llvm37.i386.core.app"/>
+									<listOptionValue builtIn="false" value="wearable-4.0-emulator.core_llvm37.i386.core.app"/>
 								</option>
 								<option id="sbi.gnu.cpp.compiler.option.frameworks_inc.core.203430937" 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-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;"/>
@@ -99,7 +100,6 @@
 									<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/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;"/>
@@ -133,11 +133,12 @@
 								<option defaultValue="gnu.c.debugging.level.max" id="sbi.gnu.c.compiler.option.debugging.level.core.1485403507" 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.366720373" name="-fPIC option" superClass="sbi.gnu.c.compiler.option.misc.pic.core" valueType="boolean"/>
 								<option id="sbi.gnu.c.compiler.option.225868252" name="Tizen-Target" superClass="sbi.gnu.c.compiler.option" valueType="userObjs">
-									<listOptionValue builtIn="false" value="wearable-4.0-emulator.core.public.20170520_1_llvm37.i386.core.app"/>
+									<listOptionValue builtIn="false" value="wearable-4.0-emulator.core_llvm37.i386.core.app"/>
 								</option>
 								<option id="sbi.gnu.c.compiler.option.frameworks_inc.core.622559712" 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-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;"/>
@@ -205,7 +206,6 @@
 									<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/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;"/>
diff --git a/tbtcoreapp/.cproject b/tbtcoreapp/.cproject
index 4bd189d..e55f079 100644
--- a/tbtcoreapp/.cproject
+++ b/tbtcoreapp/.cproject
@@ -26,7 +26,7 @@
 								<option id="gnu.cpp.compiler.option.optimization.level.982184323" name="Optimization Level" superClass="gnu.cpp.compiler.option.optimization.level" value="gnu.cpp.compiler.optimization.level.none" valueType="enumerated"/>
 								<option defaultValue="gnu.cpp.compiler.debugging.level.max" id="sbi.gnu.cpp.compiler.option.debugging.level.core.920074349" name="Debug level" superClass="sbi.gnu.cpp.compiler.option.debugging.level.core" valueType="enumerated"/>
 								<option id="sbi.gnu.cpp.compiler.option.1345120386" name="Tizen-Target" superClass="sbi.gnu.cpp.compiler.option" valueType="userObjs">
-									<listOptionValue builtIn="false" value="wearable-4.0-emulator.core_llvm37.i386.core.app"/>
+									<listOptionValue builtIn="false" value="wearable-4.0-device.core_llvm37.armel.core.app"/>
 								</option>
 								<option id="sbi.gnu.cpp.compiler.option.frameworks_inc.core.2048404299" 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;"/>
@@ -118,6 +118,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.141699551" name="Include paths (-I)" superClass="gnu.cpp.compiler.option.include.paths" valueType="includePath">
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/inc}&quot;"/>
@@ -131,7 +132,7 @@
 								<option defaultValue="gnu.c.optimization.level.none" id="gnu.c.compiler.option.optimization.level.378903474" name="Optimization Level" superClass="gnu.c.compiler.option.optimization.level" valueType="enumerated"/>
 								<option defaultValue="gnu.c.debugging.level.max" id="sbi.gnu.c.compiler.option.debugging.level.core.673392831" name="Debug level" superClass="sbi.gnu.c.compiler.option.debugging.level.core" valueType="enumerated"/>
 								<option id="sbi.gnu.c.compiler.option.763950783" name="Tizen-Target" superClass="sbi.gnu.c.compiler.option" valueType="userObjs">
-									<listOptionValue builtIn="false" value="wearable-4.0-emulator.core_llvm37.i386.core.app"/>
+									<listOptionValue builtIn="false" value="wearable-4.0-device.core_llvm37.armel.core.app"/>
 								</option>
 								<option id="sbi.gnu.c.compiler.option.frameworks_inc.core.1078644306" 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;"/>
@@ -223,6 +224,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.533209386" name="Include paths (-I)" superClass="gnu.c.compiler.option.include.paths" valueType="includePath">
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/inc}&quot;"/>
@@ -251,7 +253,7 @@
 									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
 								</inputType>
 							</tool>
-							<tool command="i386-linux-gnueabi-as" id="org.tizen.nativeapp.tool.sbi.gnu.assembler.base.2057518981" 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.2057518981" name="Assembler" superClass="org.tizen.nativeapp.tool.sbi.gnu.assembler.base">
 								<inputType id="cdt.managedbuild.tool.gnu.assembler.input.1560762112" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
 							</tool>
 							<tool id="org.tizen.nativecore.tool.fnmapgen.1330237538" name="C FN-Map Generator" superClass="org.tizen.nativecore.tool.fnmapgen"/>
diff --git a/tbtcoreapp/.sdk_delta.info b/tbtcoreapp/.sdk_delta.info
index 6377a81..4f6371b 100644
Binary files a/tbtcoreapp/.sdk_delta.info and b/tbtcoreapp/.sdk_delta.info differ
diff --git a/tbtcoreapp/inc/model/tbt-info.h b/tbtcoreapp/inc/model/tbt-info.h
index 658bd3f..1d1ad3c 100644
--- a/tbtcoreapp/inc/model/tbt-info.h
+++ b/tbtcoreapp/inc/model/tbt-info.h
@@ -173,7 +173,7 @@ typedef enum {
 	TBT_APP_AUTO_ROTATION_ENABLED,
 	TBT_APP_LOCATION_SERVICE_ENABLED,
 	TBT_APP_WIFI_HOTSPOT_ENABLED,
-	
+
 	TBT_APP_SCREEN_MIRROR_SINK,
 
 	TBT_APP_ATTACH_PANEL,
@@ -211,25 +211,25 @@ typedef enum {
     TBT_APP_NSD_SSDP_REMOTE,
 
     TBT_APP_STORAGE,
-	
+
     TBT_APP_RADIO,
-	
+
     TBT_APP_SOUND_MANAGER,
 
     TBT_APP_SOUND_MANAGER_DEVICE,
 
     TBT_APP_MEDIA_KEY,
-	
+
     TBT_APP_PACKAGE_MANAGER,
 
     TBT_APP_NOTIFICATION_TEXT,
-	
+
     TBT_APP_NOTIFICATION_TIME,
 
     TBT_APP_NOTIFICATION_TITLE,
 
     TBT_APP_NOTIFICATION_IMAGE,
-	
+
     TBT_APP_CONNECTION,
 
 	TBT_APP_SYSTEM_SETTINGS_FONT,
@@ -248,7 +248,10 @@ typedef enum {
     TBT_APP_TTS,
 	TBT_APP_STT,
 	TBT_APP_STT_ERROR,
-	TBT_APP_SMARTCARD
+
+	TBT_APP_SMARTCARD,
+	TBT_APP_MOTION_DETECTION
+
 } tbt_app_type_e;
 
 
@@ -531,7 +534,7 @@ typedef enum
 	FEATURE_TIZEN_ORG_SYSTEM_INPUT_KEY_MENU,
 	FEATURE_TIZEN_ORG_SYSTEM_INPUT_KEY_BACK,
 	FEATURE_FIDO_UAF,
-
+	FEATURE_ACTIVITY_RECOGNITION,
 	ALL_FEATURES
 
 }features_e;
@@ -741,8 +744,8 @@ static char* feature_list[1024]=
 	[FEATURE_TIZEN_ORG_SYSTEM_INPUT_KEY_VOLUME] = "tizen.org/system/input.key.volume",
 	[FEATURE_TIZEN_ORG_SYSTEM_INPUT_KEY_MENU] = "tizen.org/system/input.key.menu",
 	[FEATURE_TIZEN_ORG_SYSTEM_INPUT_KEY_BACK] = "tizen.org/system/input.key.back",
-	[FEATURE_FIDO_UAF] = "tizen.org/feature/fido.uaf"
-
+	[FEATURE_FIDO_UAF] = "tizen.org/feature/fido.uaf",
+	[FEATURE_ACTIVITY_RECOGNITION] = "tizen.org/feature/activity_recognition"
 };
 
 #endif /* __TBT_INFO_H__ */
diff --git a/tbtcoreapp/inc/utils/app_module_config.h b/tbtcoreapp/inc/utils/app_module_config.h
index 1bc595e..45598cc 100644
--- a/tbtcoreapp/inc/utils/app_module_config.h
+++ b/tbtcoreapp/inc/utils/app_module_config.h
@@ -249,4 +249,6 @@
 #define TBT_MODULE_SMARTCARD
 #define TBT_MODULE_APP_SMARTCARD
 
+#define TBT_MODULE_MOTION
+#define TBT_MODULE_APP_MOTION_DETECTION
 #endif
diff --git a/tbtcoreapp/inc/view/tbt-motion-detection-view.h b/tbtcoreapp/inc/view/tbt-motion-detection-view.h
new file mode 100644
index 0000000..ab9254a
--- /dev/null
+++ b/tbtcoreapp/inc/view/tbt-motion-detection-view.h
@@ -0,0 +1,57 @@
+/*******************************************************************************
+ * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ *
+ *  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.
+ *
+ *******************************************************************************/
+/**
+ * @file	tbt-motion-detection-view.h
+ * @brief	Detect motion in device
+ * @since_tizen 3.0
+ * @author	Maneesha Karn (maneesha.k@samsung.com)
+ * @date	August, 2017
+ * @bug		NA
+ * @credit
+ *
+ */
+
+#ifndef __TBT_MOTION_DETECTION_VIEW_H__
+#define __TBT_MOTION_DETECTION_VIEW_H__
+
+#include "utils/app_module_config.h"
+#ifdef TBT_MODULE_MOTION
+
+#include <Evas.h>
+#include "model/tbt-list.h"
+
+#include <activity_recognition.h>
+#include <gesture_recognition.h>
+
+/**
+ * @typedef _motion_detection_view
+ * @since_tizen 4.0
+ * @brief A motion detection handler
+ */
+typedef struct _motion_detection_view motion_detection_view;
+
+/**
+ * @brief Add motion detection view
+ * @since_tizen 3.0
+ * @param[in] app The pointer to _app_data instance
+ * @param[in] navi The naviframe object
+ * @return motion detection view data
+ */
+motion_detection_view *motion_detection_view_add(Evas_Object *navi, tbt_info *tbt_info, Elm_Object_Item *item);
+
+#endif  //TBT_MODULE_MOTION
+#endif // __TBT_MOTION_DETECTION_VIEW_H__
diff --git a/tbtcoreapp/res/edje/2.3.1/wearable_216_432/motion_detection_viewer.edc b/tbtcoreapp/res/edje/2.3.1/wearable_216_432/motion_detection_viewer.edc
new file mode 100644
index 0000000..72f2545
--- /dev/null
+++ b/tbtcoreapp/res/edje/2.3.1/wearable_216_432/motion_detection_viewer.edc
@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) 2014 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * 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.
+ */
+
+#define TEXT_HEIGHT 0.08
+#define CONTENT_X_PAD 0.15
+
+collections
+{
+   base_scale: 1.8;
+   group
+   {
+      name: "motion_detection_viewer";
+      parts{
+         part{
+            name: "activity_text";
+            type: SWALLOW;
+            description{
+               state: "default" 0.0;
+               align: 0.0 0.0;
+               visible: 1;
+               rel1 {relative: 0.0 0.0; }
+               rel2 {relative: 1.0 TEXT_HEIGHT; }
+            }
+         }
+
+         part{
+            name: "activity_image";
+            type: SWALLOW;
+            description{
+               state: "default" 0.0;
+               align: 0.5 0.5;
+               max : 100 100;
+               min : 100 100;
+               visible: 1;
+               rel1{
+                  relative: 1.0 1.0;
+                  to_y: "activity_text";
+               }
+               rel2{
+                  relative: 0.0 0.80;
+               }
+            }
+         }
+         part{
+            name: "controlr_part";
+            type: SWALLOW;
+            description {
+               state: "default" 0.0;
+               align : 0 0.5;
+               rel1 {
+                  relative: 0.0 1.0;
+                  to_y: "activity_image";
+               }
+               rel2 {
+                  relative: 1.0 1.0;
+               }
+               visible: 1;
+            }//Ending description
+         }//Ending part
+      }//Ending parts
+   }//Ending group
+}//Ending collections
diff --git a/tbtcoreapp/res/edje/2.3.1/wearable_320_320/motion_detection_viewer.edc b/tbtcoreapp/res/edje/2.3.1/wearable_320_320/motion_detection_viewer.edc
new file mode 100644
index 0000000..72f2545
--- /dev/null
+++ b/tbtcoreapp/res/edje/2.3.1/wearable_320_320/motion_detection_viewer.edc
@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) 2014 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * 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.
+ */
+
+#define TEXT_HEIGHT 0.08
+#define CONTENT_X_PAD 0.15
+
+collections
+{
+   base_scale: 1.8;
+   group
+   {
+      name: "motion_detection_viewer";
+      parts{
+         part{
+            name: "activity_text";
+            type: SWALLOW;
+            description{
+               state: "default" 0.0;
+               align: 0.0 0.0;
+               visible: 1;
+               rel1 {relative: 0.0 0.0; }
+               rel2 {relative: 1.0 TEXT_HEIGHT; }
+            }
+         }
+
+         part{
+            name: "activity_image";
+            type: SWALLOW;
+            description{
+               state: "default" 0.0;
+               align: 0.5 0.5;
+               max : 100 100;
+               min : 100 100;
+               visible: 1;
+               rel1{
+                  relative: 1.0 1.0;
+                  to_y: "activity_text";
+               }
+               rel2{
+                  relative: 0.0 0.80;
+               }
+            }
+         }
+         part{
+            name: "controlr_part";
+            type: SWALLOW;
+            description {
+               state: "default" 0.0;
+               align : 0 0.5;
+               rel1 {
+                  relative: 0.0 1.0;
+                  to_y: "activity_image";
+               }
+               rel2 {
+                  relative: 1.0 1.0;
+               }
+               visible: 1;
+            }//Ending description
+         }//Ending part
+      }//Ending parts
+   }//Ending group
+}//Ending collections
diff --git a/tbtcoreapp/res/edje/2.3.1/wearable_360_360/motion_detection_viewer.edc b/tbtcoreapp/res/edje/2.3.1/wearable_360_360/motion_detection_viewer.edc
new file mode 100644
index 0000000..72f2545
--- /dev/null
+++ b/tbtcoreapp/res/edje/2.3.1/wearable_360_360/motion_detection_viewer.edc
@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) 2014 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * 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.
+ */
+
+#define TEXT_HEIGHT 0.08
+#define CONTENT_X_PAD 0.15
+
+collections
+{
+   base_scale: 1.8;
+   group
+   {
+      name: "motion_detection_viewer";
+      parts{
+         part{
+            name: "activity_text";
+            type: SWALLOW;
+            description{
+               state: "default" 0.0;
+               align: 0.0 0.0;
+               visible: 1;
+               rel1 {relative: 0.0 0.0; }
+               rel2 {relative: 1.0 TEXT_HEIGHT; }
+            }
+         }
+
+         part{
+            name: "activity_image";
+            type: SWALLOW;
+            description{
+               state: "default" 0.0;
+               align: 0.5 0.5;
+               max : 100 100;
+               min : 100 100;
+               visible: 1;
+               rel1{
+                  relative: 1.0 1.0;
+                  to_y: "activity_text";
+               }
+               rel2{
+                  relative: 0.0 0.80;
+               }
+            }
+         }
+         part{
+            name: "controlr_part";
+            type: SWALLOW;
+            description {
+               state: "default" 0.0;
+               align : 0 0.5;
+               rel1 {
+                  relative: 0.0 1.0;
+                  to_y: "activity_image";
+               }
+               rel2 {
+                  relative: 1.0 1.0;
+               }
+               visible: 1;
+            }//Ending description
+         }//Ending part
+      }//Ending parts
+   }//Ending group
+}//Ending collections
diff --git a/tbtcoreapp/res/edje/2.3.1/wearable_360_x_480/motion_detection_viewer.edc b/tbtcoreapp/res/edje/2.3.1/wearable_360_x_480/motion_detection_viewer.edc
new file mode 100644
index 0000000..72f2545
--- /dev/null
+++ b/tbtcoreapp/res/edje/2.3.1/wearable_360_x_480/motion_detection_viewer.edc
@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) 2014 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * 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.
+ */
+
+#define TEXT_HEIGHT 0.08
+#define CONTENT_X_PAD 0.15
+
+collections
+{
+   base_scale: 1.8;
+   group
+   {
+      name: "motion_detection_viewer";
+      parts{
+         part{
+            name: "activity_text";
+            type: SWALLOW;
+            description{
+               state: "default" 0.0;
+               align: 0.0 0.0;
+               visible: 1;
+               rel1 {relative: 0.0 0.0; }
+               rel2 {relative: 1.0 TEXT_HEIGHT; }
+            }
+         }
+
+         part{
+            name: "activity_image";
+            type: SWALLOW;
+            description{
+               state: "default" 0.0;
+               align: 0.5 0.5;
+               max : 100 100;
+               min : 100 100;
+               visible: 1;
+               rel1{
+                  relative: 1.0 1.0;
+                  to_y: "activity_text";
+               }
+               rel2{
+                  relative: 0.0 0.80;
+               }
+            }
+         }
+         part{
+            name: "controlr_part";
+            type: SWALLOW;
+            description {
+               state: "default" 0.0;
+               align : 0 0.5;
+               rel1 {
+                  relative: 0.0 1.0;
+                  to_y: "activity_image";
+               }
+               rel2 {
+                  relative: 1.0 1.0;
+               }
+               visible: 1;
+            }//Ending description
+         }//Ending part
+      }//Ending parts
+   }//Ending group
+}//Ending collections
diff --git a/tbtcoreapp/res/edje/2.4/wearable/motion_detection_viewer.edc b/tbtcoreapp/res/edje/2.4/wearable/motion_detection_viewer.edc
new file mode 100644
index 0000000..72f2545
--- /dev/null
+++ b/tbtcoreapp/res/edje/2.4/wearable/motion_detection_viewer.edc
@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) 2014 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * 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.
+ */
+
+#define TEXT_HEIGHT 0.08
+#define CONTENT_X_PAD 0.15
+
+collections
+{
+   base_scale: 1.8;
+   group
+   {
+      name: "motion_detection_viewer";
+      parts{
+         part{
+            name: "activity_text";
+            type: SWALLOW;
+            description{
+               state: "default" 0.0;
+               align: 0.0 0.0;
+               visible: 1;
+               rel1 {relative: 0.0 0.0; }
+               rel2 {relative: 1.0 TEXT_HEIGHT; }
+            }
+         }
+
+         part{
+            name: "activity_image";
+            type: SWALLOW;
+            description{
+               state: "default" 0.0;
+               align: 0.5 0.5;
+               max : 100 100;
+               min : 100 100;
+               visible: 1;
+               rel1{
+                  relative: 1.0 1.0;
+                  to_y: "activity_text";
+               }
+               rel2{
+                  relative: 0.0 0.80;
+               }
+            }
+         }
+         part{
+            name: "controlr_part";
+            type: SWALLOW;
+            description {
+               state: "default" 0.0;
+               align : 0 0.5;
+               rel1 {
+                  relative: 0.0 1.0;
+                  to_y: "activity_image";
+               }
+               rel2 {
+                  relative: 1.0 1.0;
+               }
+               visible: 1;
+            }//Ending description
+         }//Ending part
+      }//Ending parts
+   }//Ending group
+}//Ending collections
diff --git a/tbtcoreapp/res/edje/2.4/wearable_320_x_320/motion_detection_viewer.edc b/tbtcoreapp/res/edje/2.4/wearable_320_x_320/motion_detection_viewer.edc
new file mode 100644
index 0000000..72f2545
--- /dev/null
+++ b/tbtcoreapp/res/edje/2.4/wearable_320_x_320/motion_detection_viewer.edc
@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) 2014 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * 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.
+ */
+
+#define TEXT_HEIGHT 0.08
+#define CONTENT_X_PAD 0.15
+
+collections
+{
+   base_scale: 1.8;
+   group
+   {
+      name: "motion_detection_viewer";
+      parts{
+         part{
+            name: "activity_text";
+            type: SWALLOW;
+            description{
+               state: "default" 0.0;
+               align: 0.0 0.0;
+               visible: 1;
+               rel1 {relative: 0.0 0.0; }
+               rel2 {relative: 1.0 TEXT_HEIGHT; }
+            }
+         }
+
+         part{
+            name: "activity_image";
+            type: SWALLOW;
+            description{
+               state: "default" 0.0;
+               align: 0.5 0.5;
+               max : 100 100;
+               min : 100 100;
+               visible: 1;
+               rel1{
+                  relative: 1.0 1.0;
+                  to_y: "activity_text";
+               }
+               rel2{
+                  relative: 0.0 0.80;
+               }
+            }
+         }
+         part{
+            name: "controlr_part";
+            type: SWALLOW;
+            description {
+               state: "default" 0.0;
+               align : 0 0.5;
+               rel1 {
+                  relative: 0.0 1.0;
+                  to_y: "activity_image";
+               }
+               rel2 {
+                  relative: 1.0 1.0;
+               }
+               visible: 1;
+            }//Ending description
+         }//Ending part
+      }//Ending parts
+   }//Ending group
+}//Ending collections
diff --git a/tbtcoreapp/res/edje/2.4/wearable_360_x_480/motion_detection_viewer.edc b/tbtcoreapp/res/edje/2.4/wearable_360_x_480/motion_detection_viewer.edc
new file mode 100644
index 0000000..72f2545
--- /dev/null
+++ b/tbtcoreapp/res/edje/2.4/wearable_360_x_480/motion_detection_viewer.edc
@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) 2014 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * 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.
+ */
+
+#define TEXT_HEIGHT 0.08
+#define CONTENT_X_PAD 0.15
+
+collections
+{
+   base_scale: 1.8;
+   group
+   {
+      name: "motion_detection_viewer";
+      parts{
+         part{
+            name: "activity_text";
+            type: SWALLOW;
+            description{
+               state: "default" 0.0;
+               align: 0.0 0.0;
+               visible: 1;
+               rel1 {relative: 0.0 0.0; }
+               rel2 {relative: 1.0 TEXT_HEIGHT; }
+            }
+         }
+
+         part{
+            name: "activity_image";
+            type: SWALLOW;
+            description{
+               state: "default" 0.0;
+               align: 0.5 0.5;
+               max : 100 100;
+               min : 100 100;
+               visible: 1;
+               rel1{
+                  relative: 1.0 1.0;
+                  to_y: "activity_text";
+               }
+               rel2{
+                  relative: 0.0 0.80;
+               }
+            }
+         }
+         part{
+            name: "controlr_part";
+            type: SWALLOW;
+            description {
+               state: "default" 0.0;
+               align : 0 0.5;
+               rel1 {
+                  relative: 0.0 1.0;
+                  to_y: "activity_image";
+               }
+               rel2 {
+                  relative: 1.0 1.0;
+               }
+               visible: 1;
+            }//Ending description
+         }//Ending part
+      }//Ending parts
+   }//Ending group
+}//Ending collections
diff --git a/tbtcoreapp/res/edje/2.4/wearable_circle/motion_detection_viewer.edc b/tbtcoreapp/res/edje/2.4/wearable_circle/motion_detection_viewer.edc
new file mode 100644
index 0000000..72f2545
--- /dev/null
+++ b/tbtcoreapp/res/edje/2.4/wearable_circle/motion_detection_viewer.edc
@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) 2014 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * 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.
+ */
+
+#define TEXT_HEIGHT 0.08
+#define CONTENT_X_PAD 0.15
+
+collections
+{
+   base_scale: 1.8;
+   group
+   {
+      name: "motion_detection_viewer";
+      parts{
+         part{
+            name: "activity_text";
+            type: SWALLOW;
+            description{
+               state: "default" 0.0;
+               align: 0.0 0.0;
+               visible: 1;
+               rel1 {relative: 0.0 0.0; }
+               rel2 {relative: 1.0 TEXT_HEIGHT; }
+            }
+         }
+
+         part{
+            name: "activity_image";
+            type: SWALLOW;
+            description{
+               state: "default" 0.0;
+               align: 0.5 0.5;
+               max : 100 100;
+               min : 100 100;
+               visible: 1;
+               rel1{
+                  relative: 1.0 1.0;
+                  to_y: "activity_text";
+               }
+               rel2{
+                  relative: 0.0 0.80;
+               }
+            }
+         }
+         part{
+            name: "controlr_part";
+            type: SWALLOW;
+            description {
+               state: "default" 0.0;
+               align : 0 0.5;
+               rel1 {
+                  relative: 0.0 1.0;
+                  to_y: "activity_image";
+               }
+               rel2 {
+                  relative: 1.0 1.0;
+               }
+               visible: 1;
+            }//Ending description
+         }//Ending part
+      }//Ending parts
+   }//Ending group
+}//Ending collections
diff --git a/tbtcoreapp/res/edje/3.0/wearable/motion_detection_viewer.edc b/tbtcoreapp/res/edje/3.0/wearable/motion_detection_viewer.edc
new file mode 100644
index 0000000..72f2545
--- /dev/null
+++ b/tbtcoreapp/res/edje/3.0/wearable/motion_detection_viewer.edc
@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) 2014 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * 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.
+ */
+
+#define TEXT_HEIGHT 0.08
+#define CONTENT_X_PAD 0.15
+
+collections
+{
+   base_scale: 1.8;
+   group
+   {
+      name: "motion_detection_viewer";
+      parts{
+         part{
+            name: "activity_text";
+            type: SWALLOW;
+            description{
+               state: "default" 0.0;
+               align: 0.0 0.0;
+               visible: 1;
+               rel1 {relative: 0.0 0.0; }
+               rel2 {relative: 1.0 TEXT_HEIGHT; }
+            }
+         }
+
+         part{
+            name: "activity_image";
+            type: SWALLOW;
+            description{
+               state: "default" 0.0;
+               align: 0.5 0.5;
+               max : 100 100;
+               min : 100 100;
+               visible: 1;
+               rel1{
+                  relative: 1.0 1.0;
+                  to_y: "activity_text";
+               }
+               rel2{
+                  relative: 0.0 0.80;
+               }
+            }
+         }
+         part{
+            name: "controlr_part";
+            type: SWALLOW;
+            description {
+               state: "default" 0.0;
+               align : 0 0.5;
+               rel1 {
+                  relative: 0.0 1.0;
+                  to_y: "activity_image";
+               }
+               rel2 {
+                  relative: 1.0 1.0;
+               }
+               visible: 1;
+            }//Ending description
+         }//Ending part
+      }//Ending parts
+   }//Ending group
+}//Ending collections
diff --git a/tbtcoreapp/res/edje/3.0/wearable_320_x_320/motion_detection_viewer.edc b/tbtcoreapp/res/edje/3.0/wearable_320_x_320/motion_detection_viewer.edc
new file mode 100644
index 0000000..72f2545
--- /dev/null
+++ b/tbtcoreapp/res/edje/3.0/wearable_320_x_320/motion_detection_viewer.edc
@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) 2014 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * 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.
+ */
+
+#define TEXT_HEIGHT 0.08
+#define CONTENT_X_PAD 0.15
+
+collections
+{
+   base_scale: 1.8;
+   group
+   {
+      name: "motion_detection_viewer";
+      parts{
+         part{
+            name: "activity_text";
+            type: SWALLOW;
+            description{
+               state: "default" 0.0;
+               align: 0.0 0.0;
+               visible: 1;
+               rel1 {relative: 0.0 0.0; }
+               rel2 {relative: 1.0 TEXT_HEIGHT; }
+            }
+         }
+
+         part{
+            name: "activity_image";
+            type: SWALLOW;
+            description{
+               state: "default" 0.0;
+               align: 0.5 0.5;
+               max : 100 100;
+               min : 100 100;
+               visible: 1;
+               rel1{
+                  relative: 1.0 1.0;
+                  to_y: "activity_text";
+               }
+               rel2{
+                  relative: 0.0 0.80;
+               }
+            }
+         }
+         part{
+            name: "controlr_part";
+            type: SWALLOW;
+            description {
+               state: "default" 0.0;
+               align : 0 0.5;
+               rel1 {
+                  relative: 0.0 1.0;
+                  to_y: "activity_image";
+               }
+               rel2 {
+                  relative: 1.0 1.0;
+               }
+               visible: 1;
+            }//Ending description
+         }//Ending part
+      }//Ending parts
+   }//Ending group
+}//Ending collections
diff --git a/tbtcoreapp/res/edje/3.0/wearable_360_x_480/motion_detection_viewer.edc b/tbtcoreapp/res/edje/3.0/wearable_360_x_480/motion_detection_viewer.edc
new file mode 100644
index 0000000..72f2545
--- /dev/null
+++ b/tbtcoreapp/res/edje/3.0/wearable_360_x_480/motion_detection_viewer.edc
@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) 2014 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * 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.
+ */
+
+#define TEXT_HEIGHT 0.08
+#define CONTENT_X_PAD 0.15
+
+collections
+{
+   base_scale: 1.8;
+   group
+   {
+      name: "motion_detection_viewer";
+      parts{
+         part{
+            name: "activity_text";
+            type: SWALLOW;
+            description{
+               state: "default" 0.0;
+               align: 0.0 0.0;
+               visible: 1;
+               rel1 {relative: 0.0 0.0; }
+               rel2 {relative: 1.0 TEXT_HEIGHT; }
+            }
+         }
+
+         part{
+            name: "activity_image";
+            type: SWALLOW;
+            description{
+               state: "default" 0.0;
+               align: 0.5 0.5;
+               max : 100 100;
+               min : 100 100;
+               visible: 1;
+               rel1{
+                  relative: 1.0 1.0;
+                  to_y: "activity_text";
+               }
+               rel2{
+                  relative: 0.0 0.80;
+               }
+            }
+         }
+         part{
+            name: "controlr_part";
+            type: SWALLOW;
+            description {
+               state: "default" 0.0;
+               align : 0 0.5;
+               rel1 {
+                  relative: 0.0 1.0;
+                  to_y: "activity_image";
+               }
+               rel2 {
+                  relative: 1.0 1.0;
+               }
+               visible: 1;
+            }//Ending description
+         }//Ending part
+      }//Ending parts
+   }//Ending group
+}//Ending collections
diff --git a/tbtcoreapp/res/edje/3.0/wearable_circle/motion_detection_viewer.edc b/tbtcoreapp/res/edje/3.0/wearable_circle/motion_detection_viewer.edc
new file mode 100644
index 0000000..72f2545
--- /dev/null
+++ b/tbtcoreapp/res/edje/3.0/wearable_circle/motion_detection_viewer.edc
@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) 2014 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * 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.
+ */
+
+#define TEXT_HEIGHT 0.08
+#define CONTENT_X_PAD 0.15
+
+collections
+{
+   base_scale: 1.8;
+   group
+   {
+      name: "motion_detection_viewer";
+      parts{
+         part{
+            name: "activity_text";
+            type: SWALLOW;
+            description{
+               state: "default" 0.0;
+               align: 0.0 0.0;
+               visible: 1;
+               rel1 {relative: 0.0 0.0; }
+               rel2 {relative: 1.0 TEXT_HEIGHT; }
+            }
+         }
+
+         part{
+            name: "activity_image";
+            type: SWALLOW;
+            description{
+               state: "default" 0.0;
+               align: 0.5 0.5;
+               max : 100 100;
+               min : 100 100;
+               visible: 1;
+               rel1{
+                  relative: 1.0 1.0;
+                  to_y: "activity_text";
+               }
+               rel2{
+                  relative: 0.0 0.80;
+               }
+            }
+         }
+         part{
+            name: "controlr_part";
+            type: SWALLOW;
+            description {
+               state: "default" 0.0;
+               align : 0 0.5;
+               rel1 {
+                  relative: 0.0 1.0;
+                  to_y: "activity_image";
+               }
+               rel2 {
+                  relative: 1.0 1.0;
+               }
+               visible: 1;
+            }//Ending description
+         }//Ending part
+      }//Ending parts
+   }//Ending group
+}//Ending collections
diff --git a/tbtcoreapp/res/images/Not_Detecting.jpg b/tbtcoreapp/res/images/Not_Detecting.jpg
new file mode 100755
index 0000000..8b28cfb
Binary files /dev/null and b/tbtcoreapp/res/images/Not_Detecting.jpg differ
diff --git a/tbtcoreapp/src/model/tbt-list.c b/tbtcoreapp/src/model/tbt-list.c
index 8cfeb80..a86249b 100644
--- a/tbtcoreapp/src/model/tbt-list.c
+++ b/tbtcoreapp/src/model/tbt-list.c
@@ -2576,10 +2576,27 @@ static tbt_info tbtapps[] =
 			.icon_name = "dummy",
 			.info = "DALi Scroll Functionality",
 			.result = 0,
+		},
+	#endif
+#endif
+#ifdef TBT_MODULE_MOTION
+	#ifdef TBT_MODULE_APP_MOTION_DETECTION
+		{
+			.name = "Motion Detection",
+			.parent = "Motion",
+			.apptype = TBT_APP_MOTION_DETECTION,
+			.icon_name = "dummy",
+			.file_name = "images/Not_Detecting.jpg",
+			.info = "1.Please press Start Detection <br/>2. Perform corresponding activity with phone in hand(Stationary, Walk, Run and In Vehicle <br/>3. Once done press Stop Detection <br/>4. If All Activities are indicated on the label then Test Case Pass else Fail",
+			.result = 0,
+			.required_features_count = 1,
+			.features_required = {FEATURE_ACTIVITY_RECOGNITION}
 		}
 	#endif
 #endif
 
+
+
 };
 
 #ifdef TBT_MODULE_SENSOR
diff --git a/tbtcoreapp/src/view/tbt-feature-view.c b/tbtcoreapp/src/view/tbt-feature-view.c
index 8256165..f22fdbb 100644
--- a/tbtcoreapp/src/view/tbt-feature-view.c
+++ b/tbtcoreapp/src/view/tbt-feature-view.c
@@ -257,7 +257,8 @@ static void feature_summary_list_prepare(feature_view *this)
 				"tizen.org/feature/vision.face_recognition",
 				"tizen.org/feature/vision.image_recognition",
 				"tizen.org/feature/vision.qrcode_generation",
-				"tizen.org/feature/vision.qrcode_recognition"};
+				"tizen.org/feature/vision.qrcode_recognition",
+				"tizen.org/feature/activity_recognition"};
 
 	char chResult[1000];
 	int i;
diff --git a/tbtcoreapp/src/view/tbt-genlist-view.c b/tbtcoreapp/src/view/tbt-genlist-view.c
index cdc3fca..35c86e1 100644
--- a/tbtcoreapp/src/view/tbt-genlist-view.c
+++ b/tbtcoreapp/src/view/tbt-genlist-view.c
@@ -99,7 +99,7 @@
 #include "view/tbt-tts-view.h"
 #include "view/tbt-stt-view.h"
 #include "view/tbt-smartcard-view.h"
-
+#include "view/tbt-motion-detection-view.h"
 
 typedef struct
 {
@@ -1257,7 +1257,11 @@ static void _gl_item_selected_cb(void *data, Evas_Object *obj EINA_UNUSED, void
 				break;
 			#endif
 		#endif
-
+		#ifdef TBT_MODULE_MOTION
+			case TBT_APP_MOTION_DETECTION:
+				motion_detection_view_add(view->navi, info, it);
+				break;
+		#endif
 		default:
 			assert(false);
 			break;
diff --git a/tbtcoreapp/src/view/tbt-motion-detection-view.c b/tbtcoreapp/src/view/tbt-motion-detection-view.c
new file mode 100644
index 0000000..4445408
--- /dev/null
+++ b/tbtcoreapp/src/view/tbt-motion-detection-view.c
@@ -0,0 +1,330 @@
+/*******************************************************************************
+ * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ *
+ *  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.
+ *******************************************************************************/
+/**
+ * @file	tbt-motion-detection-view.c
+ * @brief	shows motion detected and indicates the same on display
+ *
+ * @author	Maneesha Karn (maneesha.k@samsung.com)
+ * @date	August, 2017
+ * @bug		no known bug
+ * @credit
+ *
+ */
+
+#include "utils/app_module_config.h"
+#ifdef TBT_MODULE_MOTION
+
+#include <Elementary.h>
+
+#include "utils/logger.h"
+#include "utils/config.h"
+#include "utils/ui-utils.h"
+#include "view/tbt-motion-detection-view.h"
+#include "view/tbt-common-view.h"
+
+
+enum
+{
+    ACTIVITY_TOOLBAR_ITEM_INDEX_STATIONARY = 0,
+    ACTIVITY_TOOLBAR_ITEM_INDEX_WALK,
+    ACTIVITY_TOOLBAR_ITEM_INDEX_RUN,
+    ACTIVITY_TOOLBAR_ITEM_INDEX_IN_VEHICLE,
+    ACTIVITY_TOOLBAR_ITEM_INDEX_COUNT_MAX
+} ACTIVITY_TOOLBAR_ITEM_INDEXS;
+
+
+struct _motion_detection_view
+{
+    common_view* view;
+    activity_h handle;
+    Evas_Object *start_detection_button;
+    Evas_Object *stop_detection_button;
+    Evas_Object *activity_image;
+    Evas_Object *activity_label;
+};
+
+static void _app_destroy_cb(void* this);
+static void _start_detection_button_pressed_cb(void *data, Evas_Object *obj, void *event_info);
+static void _stop_detection_button_pressed_cb(void *data, Evas_Object *obj, void *event_info);
+static char * _motion_get_activity_type(activity_type_e activity_type);
+static Evas_Object *add_control_layout(motion_detection_view *this, Evas_Object *parent);
+static void activity_recognition_callback_check_type(activity_type_e activity, const activity_data_h data, double timestamp, activity_error_e error, void *user_data);
+static char *_activity_error(int activity_error);
+
+
+/**
+ * @function		motion_detection_view_add
+ * @since_tizen		2.3
+ * @description		Motion Detection View Add
+ * @parameter		Evas_Object*: Evas Object Pointer, tbt_info*: Tbt Info Pointer, Elm_Object_Item*: Elm Object Item Pointer
+ * @return			motion_detection_view*
+ */
+motion_detection_view *motion_detection_view_add(Evas_Object *navi, tbt_info *tbt_info, Elm_Object_Item *item)
+{
+    RETVM_IF(NULL == navi, NULL, "navi is null");
+
+    int x,y,w,h;
+    evas_object_geometry_get(navi, &x, &y, &w, &h);
+    DBG("Dim: %d %d %d %d", x, y, w, h);
+
+    motion_detection_view *this = NULL;
+    this = calloc(1, sizeof(motion_detection_view));
+    RETVM_IF(!this, NULL, "calloc failed");
+
+    this->view = calloc(1, sizeof(common_view));
+    RETVM_IF(!this->view, NULL, "calloc failed");
+
+    tbt_info->layout_group = "motion_detection_viewer";
+    tbt_info->layout_file = get_edje_path("motion_detection_viewer.edj");
+
+    common_view_add(navi, tbt_info, item, this->view, _app_destroy_cb, this);
+
+    RETVM_IF(NULL == this->view, NULL, "navi is null");
+
+    this->activity_label = ui_utils_label_add(this->view->layout, "Activity Status");
+    RETVM_IF(NULL == this->activity_label, NULL, "Label is null");
+
+    elm_object_part_content_set(this->view->layout, "activity_text", this->activity_label);
+    ui_utils_label_set_text(this->activity_label, "Activity Status", "left");
+    const char *file_path;
+    file_path = get_resource_path(this->view->tbt_info->file_name);
+    this->activity_image = ui_utils_create_image(this->view->layout, file_path);
+
+    //int x,y,w,h;
+    evas_object_geometry_get(this->activity_image, &x, &y, &w, &h);
+    DBG("Dim: %d %d %d %d", x, y, w, h);
+
+    RETVM_IF(NULL == this->activity_image, false, "creation of layout elements failed");
+
+    elm_object_part_content_set(this->view->layout, "activity_image", this->activity_image);
+
+    Evas_Object *control = add_control_layout(this, this->view->layout);
+    elm_object_part_content_set(this->view->layout, "controlr_part", control);
+    evas_object_show(control);
+    return this;
+}
+
+
+
+
+/**
+ * @function		_activity_error
+ * @since_tizen		3.0
+ * @description		Return string name of Activity Error detected
+ * @parameter		int activity_error
+ * @return			static char *
+ */
+static char *_activity_error(int activity_error)
+{
+	char error[50];
+	switch(activity_error)
+	{
+	case ACTIVITY_ERROR_ALREADY_STARTED :
+		strcpy(error,"ACTIVITY_ERROR_ALREADY_STARTED");
+		break;
+	case ACTIVITY_ERROR_INVALID_OPERATION:
+		strcpy(error,"ACTIVITY_ERROR_INVALID_OPERATION");
+		break;
+	case ACTIVITY_ERROR_INVALID_PARAMETER:
+		strcpy(error,"ACTIVITY_ERROR_INVALID_PARAMETER");
+		break;
+	case ACTIVITY_ERROR_NOT_STARTED :
+		strcpy(error,"ACTIVITY_ERROR_NOT_STARTED");
+		break;
+	case ACTIVITY_ERROR_NOT_SUPPORTED :
+		strcpy(error,"ACTIVITY_ERROR_NOT_SUPPORTED");
+		break;
+	case ACTIVITY_ERROR_OPERATION_FAILED:
+		strcpy(error,"ACTIVITY_ERROR_OPERATION_FAILED");
+		break;
+	case ACTIVITY_ERROR_OUT_OF_MEMORY:
+		strcpy(error,"ACTIVITY_ERROR_OUT_OF_MEMORY");
+		break;
+	case ACTIVITY_ERROR_PERMISSION_DENIED:
+		strcpy(error,"ACTIVITY_ERROR_PERMISSION_DENIED");
+		break;
+	default:
+		strcpy(error, "Unrecognized Error");
+	}
+	return strdup(error);
+	}
+
+
+
+/**
+ * @function		_motion_get_activity_type
+ * @since_tizen		3.0
+ * @description		Return string name of Activity detected
+ * @parameter		activity_type_e activity_type
+ * @return			static char *
+ */
+static char * _motion_get_activity_type(activity_type_e activity_type)
+{
+	DBG("_motion_get_activity_type");
+	const int LEN = 100;
+	char string[LEN];
+	switch(activity_type)
+	{
+	case ACTIVITY_STATIONARY :
+		snprintf(string, LEN, "Activity Stationary");
+		DBG("ACTIVITY_STATIONARY ");
+		break;
+	case ACTIVITY_WALK:
+		snprintf(string, LEN, "Activity is Walking");
+		DBG("ACTIVITY_WALK");
+		break;
+	case ACTIVITY_RUN:
+		snprintf(string, LEN, "Activity is Running");
+		DBG("ACTIVITY_RUN");
+		break;
+	case ACTIVITY_IN_VEHICLE :
+		snprintf(string, LEN, "Activity is In Vehicle");
+		DBG("ACTIVITY_IN_VEHICLE ");
+		break;
+	default :
+		snprintf(string, LEN, "Unrecognized Activity");
+		DBG("Unrecognized Activity");
+	}
+	return strdup(string);
+}
+
+
+/**
+ * @function		_start_detection_button_pressed_cb
+ * @since_tizen		3.0
+ * @description		Callback called when an activity is detected
+ * @parameter		void
+ * @return			void *data, Evas_Object *obj, void *event_info
+ */
+static void _start_detection_button_pressed_cb(void *data, Evas_Object *obj, void *event_info)
+{
+	DBG(" start_detection_button_pressed_cb ");
+
+	RETM_IF(NULL == data, "data is NULL");
+
+	motion_detection_view *this = NULL;
+	this = (motion_detection_view*)data;
+	RETM_IF(NULL == this, "view is NULL");
+	activity_type_e activity_type = ACTIVITY_STATIONARY;
+
+	int nRet = activity_start_recognition(this->handle, activity_type, activity_recognition_callback_check_type, this);
+
+	if(nRet != ACTIVITY_ERROR_NONE)
+	{
+		this->view->tbt_info->result = TBT_INFO_RESULT_NOT_SUPPORTED;
+		elm_genlist_item_update(this->view->item);
+		elm_naviframe_item_pop(this->view->navi);
+		activity_stop_recognition(this->handle);
+		activity_release(this->handle);
+		RETM_IF(nRet != ACTIVITY_ERROR_NONE, "activity_start_recognition failed for activity type = %s",_motion_get_activity_type(activity_type));
+	}
+}
+
+
+
+/**
+ * @function		activity_recognition_callback_check_type
+ * @since_tizen		3.0
+ * @description		To Check the activity type
+ * @parameter		void
+ * @return			activity_type_e activity, const activity_data_h data, double timestamp, activity_error_e error, void *user_data
+ */
+static void activity_recognition_callback_check_type(activity_type_e activity, const activity_data_h data, double timestamp, activity_error_e error, void *user_data)
+{
+	char label[200]={'\0'};
+	DBG("activity_recognition_callback_check_type");
+	RETM_IF(NULL == user_data, "User data is NULL");
+	motion_detection_view *this = (motion_detection_view*)user_data;
+	snprintf(label, sizeof(label), "%s : %s" , "Activity Status is : ", _motion_get_activity_type(activity));
+	ui_utils_label_set_text(this->activity_label, label,  "left");
+	return;
+}
+
+
+
+/**
+ * @function		_stop_detection_button_pressed_cb
+ * @since_tizen		3.0
+ * @description		To handle stop detection button pressed event
+ * @parameter		void
+ * @return			void *data, Evas_Object *obj, void *event_info
+ */
+
+
+static void _stop_detection_button_pressed_cb(void *data, Evas_Object *obj, void *event_info)
+{
+	DBG(" _stop_detection_button_pressed_cb ");
+	RETM_IF(NULL == data, "data is NULL");
+	motion_detection_view *this = NULL;
+	this = (motion_detection_view*)data;
+	RETM_IF(NULL == this, "view is NULL");
+	activity_stop_recognition(this->handle);
+	activity_release(this->handle);
+}
+
+
+/**
+ * @function		add_control_layout
+ * @since_tizen		3.0
+ * @description		To add buttons to the view
+ * @parameter		void
+ * @return			motion_detection_view *this, Evas_Object *parent
+ */
+
+static Evas_Object *add_control_layout(motion_detection_view *this, Evas_Object *parent)
+{
+	DBG("add_control_layout__");
+
+	RETVM_IF(NULL == this,  NULL, "view is NULL");
+	RETVM_IF(NULL == parent, NULL, "parent is NULL");
+
+    Evas_Object *table = elm_table_add(parent);
+
+    evas_object_size_hint_weight_set(table, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+    evas_object_size_hint_align_set(table, EVAS_HINT_FILL, EVAS_HINT_FILL);
+    evas_object_show(table);
+
+    this->start_detection_button = ui_utils_push_button_add(this, table, "Start Detection", _start_detection_button_pressed_cb);
+    RETVM_IF(NULL == this->start_detection_button, NULL,  "this->start_detection_button is NULL");
+    elm_table_pack(table, this->start_detection_button, 0, 0, 1, 1);
+    this->stop_detection_button= ui_utils_push_button_add(this, table, "Stop Detection", _stop_detection_button_pressed_cb);
+    RETVM_IF(NULL == this->stop_detection_button, NULL, "this->stop_detection_button is NULL");
+    elm_table_pack(table, this->stop_detection_button, 1, 0, 1, 1);
+
+    return table;
+}
+
+
+/**
+ * @function		_app_destroy_cb
+ * @since_tizen		2.3
+ * @description		 App Destroy Cb
+ * @parameter		void*: Void Pointer
+ * @return		static void
+ */
+static void _app_destroy_cb(void* this)
+{
+	RETM_IF(NULL == this, "data is NULL");
+
+	motion_detection_view *view = NULL;
+	view = (motion_detection_view*)this;
+	RETM_IF(NULL == view, "view is NULL");
+
+	SAFE_DELETE(view->view);
+	SAFE_DELETE(view);
+}
+
+#endif
diff --git a/tbtcoreapp/tizen-manifest.xml b/tbtcoreapp/tizen-manifest.xml
index 140dc27..3ce2cf7 100644
--- a/tbtcoreapp/tizen-manifest.xml
+++ b/tbtcoreapp/tizen-manifest.xml
@@ -7,6 +7,7 @@
     </ui-application>
     <privileges>
         <privilege>http://tizen.org/privilege/packagemanager.clearcache</privilege>
+        <privilege>http://tizen.org/privilege/healthinfo</privilege>
         <privilege>http://tizen.org/privilege/location</privilege>
         <privilege>http://tizen.org/privilege/contact.read</privilege>
         <privilege>http://tizen.org/privilege/network.set</privilege>
@@ -29,7 +30,6 @@
         <privilege>http://tizen.org/privilege/notification</privilege>
         <privilege>http://tizen.org/privilege/network.profile</privilege>
         <privilege>http://tizen.org/privilege/recorder</privilege>
-		<privilege>http://tizen.org/privilege/healthinfo</privilege>
     </privileges>
     <feature name="http://tizen.org/feature/screen.size.all">true</feature>
 </manifest>