Corrected folder structure for TPK

Change-Id: I24c208244b1e94078762f5be1ec5484ca6ed6dd2
Signed-off-by: Rahul Dadhich <r.dadhich@samsung.com>

diff --git a/.cproject b/.cproject
index 0d39a82..cfdc964 100644 (file)
--- a/.cproject
+++ b/.cproject
@@ -5,6 +5,7 @@
                        <storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="org.tizen.nativecore.config.sbi.gcc45.app.debug.215006798" moduleId="org.eclipse.cdt.core.settings" name="Debug">
                                <externalSettings/>
                                <extensions>
+                                       <extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
                                        <extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
                                        <extension id="org.tizen.nativecore.NativeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
                                        <extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
@@ -12,7 +13,6 @@
                                        <extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
                                        <extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
                                        <extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-                                       <extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
                                </extensions>
                        </storageModule>
                        <storageModule moduleId="cdtBuildSystem" version="4.0.0">
@@ -26,7 +26,7 @@
                                                                <option id="gnu.cpp.compiler.option.optimization.level.1893472559" 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.873293997" name="Debug level" superClass="sbi.gnu.cpp.compiler.option.debugging.level.core" valueType="enumerated"/>
                                                                <option id="sbi.gnu.cpp.compiler.option.420224193" name="Tizen-Target" superClass="sbi.gnu.cpp.compiler.option" valueType="userObjs">
-                                                                       <listOptionValue builtIn="false" value="mobile-3.0-emulator.core_llvm36.i386.core.app"/>
+                                                                       <listOptionValue builtIn="false" value="mobile-3.0-device.core_llvm36.armel.core.app"/>
                                                                </option>
                                                                <option id="sbi.gnu.cpp.compiler.option.frameworks_inc.core.1439160692" 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;"/>
@@ -38,6 +38,8 @@
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/base&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/cairo&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/calendar-service2&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/call-manager&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/chromium-ewk&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/ckm&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/contacts-svc&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/content&quot;"/>
@@ -70,6 +72,7 @@
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/eio-1&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/eldbus-1&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/elementary-1&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/email-service&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/embryo-1&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/emile-1&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/eo-1&quot;"/>
@@ -94,8 +97,10 @@
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/metadata-editor&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/minicontrol&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/minizip&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/msg-service&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/network&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/notification&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/nsd/&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/phonenumber-utils&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/sensor&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/service-adaptor&quot;"/>
@@ -119,6 +124,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.51879020" name="Include paths (-I)" superClass="gnu.cpp.compiler.option.include.paths" valueType="includePath">
                                                                        <listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/inc}&quot;"/>
@@ -132,7 +138,7 @@
                                                                <option defaultValue="gnu.c.optimization.level.none" id="gnu.c.compiler.option.optimization.level.850572699" 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.10466486" name="Debug level" superClass="sbi.gnu.c.compiler.option.debugging.level.core" valueType="enumerated"/>
                                                                <option id="sbi.gnu.c.compiler.option.814679810" name="Tizen-Target" superClass="sbi.gnu.c.compiler.option" valueType="userObjs">
-                                                                       <listOptionValue builtIn="false" value="mobile-3.0-emulator.core_llvm36.i386.core.app"/>
+                                                                       <listOptionValue builtIn="false" value="mobile-3.0-device.core_llvm36.armel.core.app"/>
                                                                </option>
                                                                <option id="sbi.gnu.c.compiler.option.frameworks_inc.core.1056428091" 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;"/>
@@ -144,6 +150,8 @@
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/base&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/cairo&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/calendar-service2&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/call-manager&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/chromium-ewk&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/ckm&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/contacts-svc&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/content&quot;"/>
@@ -176,6 +184,7 @@
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/eio-1&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/eldbus-1&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/elementary-1&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/email-service&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/embryo-1&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/emile-1&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/eo-1&quot;"/>
@@ -200,8 +209,10 @@
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/metadata-editor&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/minicontrol&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/minizip&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/msg-service&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/network&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/notification&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/nsd/&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/phonenumber-utils&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/sensor&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/service-adaptor&quot;"/>
@@ -225,6 +236,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.1026594349" name="Include paths (-I)" superClass="gnu.c.compiler.option.include.paths" valueType="includePath">
                                                                        <listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/inc}&quot;"/>
@@ -268,7 +280,7 @@
                                                                        <additionalInput kind="additionalinput" paths="$(LIBS)"/>
                                                                </inputType>
                                                        </tool>
-                                                       <tool command="i386-linux-gnueabi-as" id="org.tizen.nativeapp.tool.sbi.gnu.assembler.base.1039108830" 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.1039108830" name="Assembler" superClass="org.tizen.nativeapp.tool.sbi.gnu.assembler.base">
                                                                <inputType id="cdt.managedbuild.tool.gnu.assembler.input.1313196917" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
                                                        </tool>
                                                        <tool id="org.tizen.nativecore.tool.fnmapgen.692914888" name="C FN-Map Generator" superClass="org.tizen.nativecore.tool.fnmapgen"/>
@@ -280,20 +292,18 @@
                                                        <tool id="org.tizen.nativecore.tool.sbi.edc.compiler.626098173" name="EDC Resource Compiler" superClass="org.tizen.nativecore.tool.sbi.edc.compiler">
                                                                <option id="sbi.gnu.edc.compiler.option.misc.id.1317882362" name="Image Path (-id)" superClass="sbi.gnu.edc.compiler.option.misc.id" valueType="stringList">
                                                                        <listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}}/edje/images&quot;"/>
-                                                                       <listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/res/black_theme/images}&quot;"/>
-                                                                       <listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/res/black_theme/images_edc}&quot;"/>
-                                                                       <listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/res/black_theme/edc/images}&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="/home/r.dadhich/git_code/tizen_3.0/Feb24/gallery/res/edje/images"/>
                                                                </option>
                                                                <option id="sbi.gnu.edc.compiler.option.misc.sd.1377446978" name="Sound Path (-sd)" superClass="sbi.gnu.edc.compiler.option.misc.sd" valueType="stringList">
                                                                        <listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}}/edje/sounds&quot;"/>
-                                                                       <listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/res/black_theme/edc/sounds}&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/res/edje/sounds}&quot;"/>
                                                                </option>
                                                        </tool>
                                                </toolChain>
                                        </folderInfo>
                                        <sourceEntries>
                                                <entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="inc"/>
-                                               <entry excluding="black_theme/edc/gl-timeline.edc|black_theme/edc/gl-selection-notification.edc|black_theme/edc/gl-progressbar.edc|black_theme/edc/gl-popup-entry.edc|black_theme/edc/gl-nocontents.edc|black_theme/edc/gl-naviframe.edc|black_theme/edc/gl-macro.edc|black_theme/edc/gl-label.edc|black_theme/edc/gl-gengrid-item-thumbview.edc|black_theme/edc/gl-gengrid-item-ctxpopup.edc|black_theme/edc/gl-gengrid-item-albums.edc|black_theme/edc/gl-gengrid.edc|black_theme/edc/gl-expanded-title.edc|black_theme/edc/gl-entry.edc|black_theme/edc/gl-ctxpopup.edc|black_theme/edc/gl-check.edc|black_theme/edc/gl-button.edc" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="res"/>
+                                               <entry excluding="edje/gl-timeline.edc|edje/gl-selection-notification.edc|edje/gl-progressbar.edc|edje/gl-popup-entry.edc|edje/gl-nocontents.edc|edje/gl-naviframe.edc|edje/gl-macro.edc|edje/gl-label.edc|edje/gl-gengrid-item-thumbview.edc|edje/gl-gengrid-item-ctxpopup.edc|edje/gl-gengrid-item-albums.edc|edje/gl-gengrid.edc|edje/gl-expanded-title.edc|edje/gl-entry.edc|edje/gl-ctxpopup.edc|edje/gl-check.edc|edje/gl-button.edc|black_theme/edc/gl-timeline.edc|black_theme/edc/gl-selection-notification.edc|black_theme/edc/gl-progressbar.edc|black_theme/edc/gl-popup-entry.edc|black_theme/edc/gl-nocontents.edc|black_theme/edc/gl-naviframe.edc|black_theme/edc/gl-macro.edc|black_theme/edc/gl-label.edc|black_theme/edc/gl-gengrid-item-thumbview.edc|black_theme/edc/gl-gengrid-item-ctxpopup.edc|black_theme/edc/gl-gengrid-item-albums.edc|black_theme/edc/gl-gengrid.edc|black_theme/edc/gl-expanded-title.edc|black_theme/edc/gl-entry.edc|black_theme/edc/gl-ctxpopup.edc|black_theme/edc/gl-check.edc|black_theme/edc/gl-button.edc" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="res"/>
                                                <entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="shared"/>
                                                <entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="src"/>
                                        </sourceEntries>
@@ -305,6 +315,7 @@
                        <storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="org.tizen.nativecore.config.sbi.gcc45.app.release.1632975597" moduleId="org.eclipse.cdt.core.settings" name="Release">
                                <externalSettings/>
                                <extensions>
+                                       <extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
                                        <extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
                                        <extension id="org.tizen.nativecore.NativeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
                                        <extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
@@ -312,7 +323,6 @@
                                        <extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
                                        <extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
                                        <extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-                                       <extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
                                </extensions>
                        </storageModule>
                        <storageModule moduleId="cdtBuildSystem" version="4.0.0">
@@ -338,6 +348,8 @@
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/base&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/cairo&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/calendar-service2&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/call-manager&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/chromium-ewk&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/ckm&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/contacts-svc&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/content&quot;"/>
@@ -370,6 +382,7 @@
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/eio-1&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/eldbus-1&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/elementary-1&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/email-service&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/embryo-1&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/emile-1&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/eo-1&quot;"/>
@@ -394,8 +407,10 @@
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/metadata-editor&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/minicontrol&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/minizip&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/msg-service&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/network&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/notification&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/nsd/&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/phonenumber-utils&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/sensor&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/service-adaptor&quot;"/>
@@ -444,6 +459,8 @@
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/base&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/cairo&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/calendar-service2&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/call-manager&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/chromium-ewk&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/ckm&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/contacts-svc&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/content&quot;"/>
@@ -476,6 +493,7 @@
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/eio-1&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/eldbus-1&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/elementary-1&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/email-service&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/embryo-1&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/emile-1&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/eo-1&quot;"/>
@@ -500,8 +518,10 @@
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/metadata-editor&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/minicontrol&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/minizip&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/msg-service&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/network&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/notification&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/nsd/&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/phonenumber-utils&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/sensor&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/service-adaptor&quot;"/>

diff --git a/.sdk_delta.info b/.sdk_delta.info
index fb1152b..e69de29 100644 (file)
Binary files a/.sdk_delta.info and b/.sdk_delta.info differ

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8810b81..688abae 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,10 +3,10 @@ PROJECT(gallery C CXX)
 
 SET(RSRC_DIR res)
 
-SET(EDC_DIR black_theme/edc)
-SET(IMG_DIR black_theme/edc/images)
-SET(SOUND_DIR black_theme/edc/sounds)
-SET(IMG_EDC_DIR black_theme/images_edc)
+SET(EDC_DIR edje)
+SET(IMG_DIR edje/images)
+SET(SOUND_DIR edje/sounds)
+SET(IMG_EDC_DIR edje)
 
 AUX_SOURCE_DIRECTORY(${CMAKE_SOURCE_DIR}/src/2dview 2DVIEW_SRCS)
 
@@ -113,7 +113,7 @@ ADD_CUSTOM_COMMAND(OUTPUT gallery.edj
 )
 
 ADD_CUSTOM_COMMAND(OUTPUT gl-images.edj
-               COMMAND edje_cc -id ${CMAKE_SOURCE_DIR}/${RSRC_DIR}/${IMG_EDC_DIR}
+               COMMAND edje_cc -id ${CMAKE_SOURCE_DIR}/${RSRC_DIR}/${IMG_DIR}
                ${CMAKE_SOURCE_DIR}/${RSRC_DIR}/${IMG_EDC_DIR}/gl-images.edc ${CMAKE_BINARY_DIR}/gl-images.edj
                DEPENDS ${CMAKE_SOURCE_DIR}/${RSRC_DIR}/${IMG_EDC_DIR}/gl-images.edc
 )
@@ -128,10 +128,10 @@ INSTALL(FILES ${CMAKE_BINARY_DIR}/gl-images.edj DESTINATION ${EDJDIR})
 
 # install manifest file & icon
 INSTALL(FILES ${CMAKE_BINARY_DIR}/${PKGNAME}.xml DESTINATION ${CMAKE_APP_SHARE_PACKAGES_DIR})
-INSTALL(FILES ${CMAKE_SOURCE_DIR}/${RSRC_DIR}/icon/${PKGNAME}.png DESTINATION ${ICONDIR})
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/${RSRC_DIR}/${EDC_DIR}/icon/${PKGNAME}.png DESTINATION ${ICONDIR})
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/widget/res/preview_gallery_4x4.png DESTINATION ${ICONDIR})
 
-INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/res/black_theme/images DESTINATION ${RESDIR})
+INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/res/edje/images DESTINATION ${RESDIR})
 
 # i18n
 ADD_SUBDIRECTORY(res/po)

diff --git a/res/black_theme/edc/images/T01_album_icon_sd_card.png b/res/black_theme/edc/images/T01_album_icon_sd_card.png
deleted file mode 100755 (executable)
index f0803db..0000000
Binary files a/res/black_theme/edc/images/T01_album_icon_sd_card.png and /dev/null differ

diff --git a/res/black_theme/edc/images/T01_icon_back.png b/res/black_theme/edc/images/T01_icon_back.png
deleted file mode 100644 (file)
index f8e4d01..0000000
Binary files a/res/black_theme/edc/images/T01_icon_back.png and /dev/null differ

diff --git a/res/black_theme/images/T01_btn_play.png b/res/black_theme/images/T01_btn_play.png
deleted file mode 100755 (executable)
index b25d19c..0000000
Binary files a/res/black_theme/images/T01_btn_play.png and /dev/null differ

diff --git a/res/black_theme/images_edc/T01_nocontents_videos.png b/res/black_theme/images_edc/T01_nocontents_videos.png
deleted file mode 100755 (executable)
index d8393dd..0000000
Binary files a/res/black_theme/images_edc/T01_nocontents_videos.png and /dev/null differ

diff --git a/res/black_theme/edc/gallery-edc-res.h b/res/edje/gallery-edc-res.h
similarity index 100%
rename from res/black_theme/edc/gallery-edc-res.h
rename to res/edje/gallery-edc-res.h

diff --git a/res/black_theme/edc/gallery.edc b/res/edje/gallery.edc
similarity index 100%
rename from res/black_theme/edc/gallery.edc
rename to res/edje/gallery.edc

diff --git a/res/black_theme/edc/gl-button.edc b/res/edje/gl-button.edc
similarity index 100%
rename from res/black_theme/edc/gl-button.edc
rename to res/edje/gl-button.edc

diff --git a/res/black_theme/edc/gl-check.edc b/res/edje/gl-check.edc
similarity index 100%
rename from res/black_theme/edc/gl-check.edc
rename to res/edje/gl-check.edc

diff --git a/res/black_theme/edc/gl-ctxpopup.edc b/res/edje/gl-ctxpopup.edc
similarity index 100%
rename from res/black_theme/edc/gl-ctxpopup.edc
rename to res/edje/gl-ctxpopup.edc

diff --git a/res/black_theme/edc/gl-entry.edc b/res/edje/gl-entry.edc
similarity index 100%
rename from res/black_theme/edc/gl-entry.edc
rename to res/edje/gl-entry.edc

diff --git a/res/black_theme/edc/gl-expanded-title.edc b/res/edje/gl-expanded-title.edc
similarity index 100%
rename from res/black_theme/edc/gl-expanded-title.edc
rename to res/edje/gl-expanded-title.edc

diff --git a/res/black_theme/edc/gl-gengrid-item-albums.edc b/res/edje/gl-gengrid-item-albums.edc
similarity index 100%
rename from res/black_theme/edc/gl-gengrid-item-albums.edc
rename to res/edje/gl-gengrid-item-albums.edc

diff --git a/res/black_theme/edc/gl-gengrid-item-ctxpopup.edc b/res/edje/gl-gengrid-item-ctxpopup.edc
similarity index 100%
rename from res/black_theme/edc/gl-gengrid-item-ctxpopup.edc
rename to res/edje/gl-gengrid-item-ctxpopup.edc

diff --git a/res/black_theme/edc/gl-gengrid-item-thumbview.edc b/res/edje/gl-gengrid-item-thumbview.edc
similarity index 100%
rename from res/black_theme/edc/gl-gengrid-item-thumbview.edc
rename to res/edje/gl-gengrid-item-thumbview.edc

diff --git a/res/black_theme/edc/gl-gengrid.edc b/res/edje/gl-gengrid.edc
similarity index 100%
rename from res/black_theme/edc/gl-gengrid.edc
rename to res/edje/gl-gengrid.edc

diff --git a/res/black_theme/images_edc/gl-images.edc b/res/edje/gl-images.edc
similarity index 100%
rename from res/black_theme/images_edc/gl-images.edc
rename to res/edje/gl-images.edc

diff --git a/res/black_theme/edc/gl-label.edc b/res/edje/gl-label.edc
similarity index 100%
rename from res/black_theme/edc/gl-label.edc
rename to res/edje/gl-label.edc

diff --git a/res/black_theme/edc/gl-macro.edc b/res/edje/gl-macro.edc
similarity index 100%
rename from res/black_theme/edc/gl-macro.edc
rename to res/edje/gl-macro.edc

diff --git a/res/black_theme/edc/gl-naviframe.edc b/res/edje/gl-naviframe.edc
similarity index 100%
rename from res/black_theme/edc/gl-naviframe.edc
rename to res/edje/gl-naviframe.edc

diff --git a/res/black_theme/edc/gl-nocontents.edc b/res/edje/gl-nocontents.edc
similarity index 100%
rename from res/black_theme/edc/gl-nocontents.edc
rename to res/edje/gl-nocontents.edc

diff --git a/res/black_theme/edc/gl-popup-entry.edc b/res/edje/gl-popup-entry.edc
similarity index 100%
rename from res/black_theme/edc/gl-popup-entry.edc
rename to res/edje/gl-popup-entry.edc

diff --git a/res/black_theme/edc/gl-progressbar.edc b/res/edje/gl-progressbar.edc
similarity index 100%
rename from res/black_theme/edc/gl-progressbar.edc
rename to res/edje/gl-progressbar.edc

diff --git a/res/black_theme/edc/gl-selection-notification.edc b/res/edje/gl-selection-notification.edc
similarity index 100%
rename from res/black_theme/edc/gl-selection-notification.edc
rename to res/edje/gl-selection-notification.edc

diff --git a/res/black_theme/edc/gl-timeline.edc b/res/edje/gl-timeline.edc
similarity index 100%
rename from res/black_theme/edc/gl-timeline.edc
rename to res/edje/gl-timeline.edc

diff --git a/res/icon/org.tizen.gallery.png b/res/edje/icon/org.tizen.gallery.png
similarity index 100%
rename from res/icon/org.tizen.gallery.png
rename to res/edje/icon/org.tizen.gallery.png

diff --git a/res/black_theme/edc/images/00_EditField_clear.png b/res/edje/images/00_EditField_clear.png
similarity index 100%
rename from res/black_theme/edc/images/00_EditField_clear.png
rename to res/edje/images/00_EditField_clear.png

diff --git a/res/black_theme/edc/images/00_badge_bg.png b/res/edje/images/00_badge_bg.png
similarity index 100%
rename from res/black_theme/edc/images/00_badge_bg.png
rename to res/edje/images/00_badge_bg.png

diff --git a/res/black_theme/edc/images/00_button_icon_arrow.png b/res/edje/images/00_button_icon_arrow.png
similarity index 100%
rename from res/black_theme/edc/images/00_button_icon_arrow.png
rename to res/edje/images/00_button_icon_arrow.png

diff --git a/res/black_theme/edc/images/00_button_icon_arrow_press.png b/res/edje/images/00_button_icon_arrow_press.png
similarity index 100%
rename from res/black_theme/edc/images/00_button_icon_arrow_press.png
rename to res/edje/images/00_button_icon_arrow_press.png

diff --git a/res/black_theme/edc/images/00_button_reveal.png b/res/edje/images/00_button_reveal.png
similarity index 100%
rename from res/black_theme/edc/images/00_button_reveal.png
rename to res/edje/images/00_button_reveal.png

diff --git a/res/black_theme/edc/images/00_button_reveal_press.png b/res/edje/images/00_button_reveal_press.png
similarity index 100%
rename from res/black_theme/edc/images/00_button_reveal_press.png
rename to res/edje/images/00_button_reveal_press.png

diff --git a/res/black_theme/edc/images/00_check_bg_dim.png b/res/edje/images/00_check_bg_dim.png
similarity index 100%
rename from res/black_theme/edc/images/00_check_bg_dim.png
rename to res/edje/images/00_check_bg_dim.png

diff --git a/res/black_theme/edc/images/00_circle_thumbnail_bg.png b/res/edje/images/00_circle_thumbnail_bg.png
similarity index 100%
rename from res/black_theme/edc/images/00_circle_thumbnail_bg.png
rename to res/edje/images/00_circle_thumbnail_bg.png

diff --git a/res/black_theme/edc/images/00_grid_overscrolling_bottom.png b/res/edje/images/00_grid_overscrolling_bottom.png
similarity index 100%
rename from res/black_theme/edc/images/00_grid_overscrolling_bottom.png
rename to res/edje/images/00_grid_overscrolling_bottom.png

diff --git a/res/black_theme/edc/images/00_grid_overscrolling_left.png b/res/edje/images/00_grid_overscrolling_left.png
similarity index 100%
rename from res/black_theme/edc/images/00_grid_overscrolling_left.png
rename to res/edje/images/00_grid_overscrolling_left.png

diff --git a/res/black_theme/edc/images/00_grid_overscrolling_right.png b/res/edje/images/00_grid_overscrolling_right.png
similarity index 100%
rename from res/black_theme/edc/images/00_grid_overscrolling_right.png
rename to res/edje/images/00_grid_overscrolling_right.png

diff --git a/res/black_theme/edc/images/00_grid_overscrolling_top.png b/res/edje/images/00_grid_overscrolling_top.png
similarity index 100%
rename from res/black_theme/edc/images/00_grid_overscrolling_top.png
rename to res/edje/images/00_grid_overscrolling_top.png

diff --git a/res/black_theme/edc/images/00_more_popup_press.png b/res/edje/images/00_more_popup_press.png
similarity index 100%
rename from res/black_theme/edc/images/00_more_popup_press.png
rename to res/edje/images/00_more_popup_press.png

diff --git a/res/black_theme/edc/images/00_overscrolling_left.png b/res/edje/images/00_overscrolling_left.png
similarity index 100%
rename from res/black_theme/edc/images/00_overscrolling_left.png
rename to res/edje/images/00_overscrolling_left.png

diff --git a/res/black_theme/edc/images/00_overscrolling_right.png b/res/edje/images/00_overscrolling_right.png
similarity index 100%
rename from res/black_theme/edc/images/00_overscrolling_right.png
rename to res/edje/images/00_overscrolling_right.png

diff --git a/res/black_theme/edc/images/00_overscrolling_top.png b/res/edje/images/00_overscrolling_top.png
similarity index 100%
rename from res/black_theme/edc/images/00_overscrolling_top.png
rename to res/edje/images/00_overscrolling_top.png

diff --git a/res/black_theme/edc/images/00_popup_dropdown_bg.png b/res/edje/images/00_popup_dropdown_bg.png
similarity index 100%
rename from res/black_theme/edc/images/00_popup_dropdown_bg.png
rename to res/edje/images/00_popup_dropdown_bg.png

diff --git a/res/black_theme/edc/images/00_popup_dropdown_title_bg.png b/res/edje/images/00_popup_dropdown_title_bg.png
similarity index 100%
rename from res/black_theme/edc/images/00_popup_dropdown_title_bg.png
rename to res/edje/images/00_popup_dropdown_title_bg.png

diff --git a/res/black_theme/edc/images/00_popup_dropdown_title_bg_focus.png b/res/edje/images/00_popup_dropdown_title_bg_focus.png
similarity index 100%
rename from res/black_theme/edc/images/00_popup_dropdown_title_bg_focus.png
rename to res/edje/images/00_popup_dropdown_title_bg_focus.png

diff --git a/res/black_theme/edc/images/00_popup_dropdown_title_bg_press.png b/res/edje/images/00_popup_dropdown_title_bg_press.png
similarity index 100%
rename from res/black_theme/edc/images/00_popup_dropdown_title_bg_press.png
rename to res/edje/images/00_popup_dropdown_title_bg_press.png

diff --git a/res/black_theme/edc/images/00_popup_overscrolling_bottom.png b/res/edje/images/00_popup_overscrolling_bottom.png
similarity index 100%
rename from res/black_theme/edc/images/00_popup_overscrolling_bottom.png
rename to res/edje/images/00_popup_overscrolling_bottom.png

diff --git a/res/black_theme/edc/images/00_popup_overscrolling_left.png b/res/edje/images/00_popup_overscrolling_left.png
similarity index 100%
rename from res/black_theme/edc/images/00_popup_overscrolling_left.png
rename to res/edje/images/00_popup_overscrolling_left.png

diff --git a/res/black_theme/edc/images/00_popup_overscrolling_right.png b/res/edje/images/00_popup_overscrolling_right.png
similarity index 100%
rename from res/black_theme/edc/images/00_popup_overscrolling_right.png
rename to res/edje/images/00_popup_overscrolling_right.png

diff --git a/res/black_theme/edc/images/00_popup_overscrolling_top.png b/res/edje/images/00_popup_overscrolling_top.png
similarity index 100%
rename from res/black_theme/edc/images/00_popup_overscrolling_top.png
rename to res/edje/images/00_popup_overscrolling_top.png

diff --git a/res/black_theme/edc/images/00_popup_scroll.png b/res/edje/images/00_popup_scroll.png
similarity index 100%
rename from res/black_theme/edc/images/00_popup_scroll.png
rename to res/edje/images/00_popup_scroll.png

diff --git a/res/black_theme/edc/images/00_popup_scroll_h.png b/res/edje/images/00_popup_scroll_h.png
similarity index 100%
rename from res/black_theme/edc/images/00_popup_scroll_h.png
rename to res/edje/images/00_popup_scroll_h.png

diff --git a/res/black_theme/edc/images/00_popup_scroll_v.png b/res/edje/images/00_popup_scroll_v.png
similarity index 100%
rename from res/black_theme/edc/images/00_popup_scroll_v.png
rename to res/edje/images/00_popup_scroll_v.png

diff --git a/res/black_theme/edc/images/00_scroll_bar.png b/res/edje/images/00_scroll_bar.png
similarity index 100%
rename from res/black_theme/edc/images/00_scroll_bar.png
rename to res/edje/images/00_scroll_bar.png

diff --git a/res/black_theme/edc/images/00_search_edit_field_bg.png b/res/edje/images/00_search_edit_field_bg.png
similarity index 100%
rename from res/black_theme/edc/images/00_search_edit_field_bg.png
rename to res/edje/images/00_search_edit_field_bg.png

diff --git a/res/black_theme/edc/images/00_search_edit_field_bg_focus.png b/res/edje/images/00_search_edit_field_bg_focus.png
similarity index 100%
rename from res/black_theme/edc/images/00_search_edit_field_bg_focus.png
rename to res/edje/images/00_search_edit_field_bg_focus.png

diff --git a/res/black_theme/edc/images/00_thumbs_bg_focus.png b/res/edje/images/00_thumbs_bg_focus.png
similarity index 100%
rename from res/black_theme/edc/images/00_thumbs_bg_focus.png
rename to res/edje/images/00_thumbs_bg_focus.png

diff --git a/res/black_theme/edc/images/00_title_bg.png b/res/edje/images/00_title_bg.png
similarity index 100%
rename from res/black_theme/edc/images/00_title_bg.png
rename to res/edje/images/00_title_bg.png

diff --git a/res/black_theme/edc/images/00_winset_list_progress_bg.png b/res/edje/images/00_winset_list_progress_bg.png
similarity index 100%
rename from res/black_theme/edc/images/00_winset_list_progress_bg.png
rename to res/edje/images/00_winset_list_progress_bg.png

diff --git a/res/black_theme/edc/images/00_winset_title_tabbar_bg.png b/res/edje/images/00_winset_title_tabbar_bg.png
similarity index 100%
rename from res/black_theme/edc/images/00_winset_title_tabbar_bg.png
rename to res/edje/images/00_winset_title_tabbar_bg.png

diff --git a/res/black_theme/images/Contents_broken_351X261.png b/res/edje/images/Contents_broken_351X261.png
similarity index 100%
rename from res/black_theme/images/Contents_broken_351X261.png
rename to res/edje/images/Contents_broken_351X261.png

diff --git a/res/black_theme/images/No_thumbnail_351X261.png b/res/edje/images/No_thumbnail_351X261.png
similarity index 100%
rename from res/black_theme/images/No_thumbnail_351X261.png
rename to res/edje/images/No_thumbnail_351X261.png

diff --git a/res/black_theme/edc/images/T01_Nocontents_picture.png b/res/edje/images/T01_Nocontents_picture.png
similarity index 100%
rename from res/black_theme/edc/images/T01_Nocontents_picture.png
rename to res/edje/images/T01_Nocontents_picture.png

diff --git a/res/black_theme/edc/images/T01_album_edit_check_bg.png b/res/edje/images/T01_album_edit_check_bg.png
similarity index 100%
rename from res/black_theme/edc/images/T01_album_edit_check_bg.png
rename to res/edje/images/T01_album_edit_check_bg.png

diff --git a/res/black_theme/edc/images/T01_album_edit_check_off.png b/res/edje/images/T01_album_edit_check_off.png
similarity index 100%
rename from res/black_theme/edc/images/T01_album_edit_check_off.png
rename to res/edje/images/T01_album_edit_check_off.png

diff --git a/res/black_theme/edc/images/T01_album_edit_check_on.png b/res/edje/images/T01_album_edit_check_on.png
similarity index 100%
rename from res/black_theme/edc/images/T01_album_edit_check_on.png
rename to res/edje/images/T01_album_edit_check_on.png

diff --git a/res/black_theme/edc/images/T01_album_edit_rename.png b/res/edje/images/T01_album_edit_rename.png
similarity index 100%
rename from res/black_theme/edc/images/T01_album_edit_rename.png
rename to res/edje/images/T01_album_edit_rename.png

diff --git a/res/black_theme/edc/images/T01_album_edit_rename_bg.png b/res/edje/images/T01_album_edit_rename_bg.png
similarity index 100%
rename from res/black_theme/edc/images/T01_album_edit_rename_bg.png
rename to res/edje/images/T01_album_edit_rename_bg.png

diff --git a/res/black_theme/edc/images/T01_album_edit_rename_bg_press.png b/res/edje/images/T01_album_edit_rename_bg_press.png
similarity index 100%
rename from res/black_theme/edc/images/T01_album_edit_rename_bg_press.png
rename to res/edje/images/T01_album_edit_rename_bg_press.png

diff --git a/res/black_theme/edc/images/T01_album_edit_rename_press.png b/res/edje/images/T01_album_edit_rename_press.png
similarity index 100%
rename from res/black_theme/edc/images/T01_album_edit_rename_press.png
rename to res/edje/images/T01_album_edit_rename_press.png

diff --git a/res/black_theme/edc/images/T01_album_folder_bg.png b/res/edje/images/T01_album_folder_bg.png
similarity index 100%
rename from res/black_theme/edc/images/T01_album_folder_bg.png
rename to res/edje/images/T01_album_folder_bg.png

diff --git a/res/black_theme/images_edc/T01_album_icon_camera.png b/res/edje/images/T01_album_icon_camera.png
similarity index 100%
rename from res/black_theme/images_edc/T01_album_icon_camera.png
rename to res/edje/images/T01_album_icon_camera.png

diff --git a/res/black_theme/images_edc/T01_album_icon_download.png b/res/edje/images/T01_album_icon_download.png
similarity index 100%
rename from res/black_theme/images_edc/T01_album_icon_download.png
rename to res/edje/images/T01_album_icon_download.png

diff --git a/res/black_theme/images_edc/T01_album_icon_folder.png b/res/edje/images/T01_album_icon_folder.png
similarity index 100%
rename from res/black_theme/images_edc/T01_album_icon_folder.png
rename to res/edje/images/T01_album_icon_folder.png

diff --git a/res/black_theme/images_edc/T01_album_icon_sd_card.png b/res/edje/images/T01_album_icon_sd_card.png
similarity index 100%
rename from res/black_theme/images_edc/T01_album_icon_sd_card.png
rename to res/edje/images/T01_album_icon_sd_card.png

diff --git a/res/black_theme/edc/images/T01_btn_play.png b/res/edje/images/T01_btn_play.png
similarity index 100%
rename from res/black_theme/edc/images/T01_btn_play.png
rename to res/edje/images/T01_btn_play.png

diff --git a/res/black_theme/images_edc/T01_btn_thumbnail_play.png b/res/edje/images/T01_btn_thumbnail_play.png
similarity index 100%
rename from res/black_theme/images_edc/T01_btn_thumbnail_play.png
rename to res/edje/images/T01_btn_thumbnail_play.png

diff --git a/res/black_theme/edc/images/T01_bubble_icon_footsteps.png b/res/edje/images/T01_bubble_icon_footsteps.png
similarity index 100%
rename from res/black_theme/edc/images/T01_bubble_icon_footsteps.png
rename to res/edje/images/T01_bubble_icon_footsteps.png

diff --git a/res/black_theme/edc/images/T01_bubble_icon_gridview.png b/res/edje/images/T01_bubble_icon_gridview.png
similarity index 100%
rename from res/black_theme/edc/images/T01_bubble_icon_gridview.png
rename to res/edje/images/T01_bubble_icon_gridview.png

diff --git a/res/black_theme/edc/images/T01_button_circle_bg_normal.png b/res/edje/images/T01_button_circle_bg_normal.png
similarity index 100%
rename from res/black_theme/edc/images/T01_button_circle_bg_normal.png
rename to res/edje/images/T01_button_circle_bg_normal.png

diff --git a/res/black_theme/edc/images/T01_button_circle_bg_normal_press.png b/res/edje/images/T01_button_circle_bg_normal_press.png
similarity index 100%
rename from res/black_theme/edc/images/T01_button_circle_bg_normal_press.png
rename to res/edje/images/T01_button_circle_bg_normal_press.png

diff --git a/res/black_theme/edc/images/T01_check.png b/res/edje/images/T01_check.png
similarity index 100%
rename from res/black_theme/edc/images/T01_check.png
rename to res/edje/images/T01_check.png

diff --git a/res/black_theme/edc/images/T01_checkbox.png b/res/edje/images/T01_checkbox.png
similarity index 100%
rename from res/black_theme/edc/images/T01_checkbox.png
rename to res/edje/images/T01_checkbox.png

diff --git a/res/black_theme/edc/images/T01_controlbar_icon_slideshow.png b/res/edje/images/T01_controlbar_icon_slideshow.png
similarity index 100%
rename from res/black_theme/edc/images/T01_controlbar_icon_slideshow.png
rename to res/edje/images/T01_controlbar_icon_slideshow.png

diff --git a/res/black_theme/edc/images/T01_editl_effect.png b/res/edje/images/T01_editl_effect.png
similarity index 100%
rename from res/black_theme/edc/images/T01_editl_effect.png
rename to res/edje/images/T01_editl_effect.png

diff --git a/res/black_theme/edc/images/T01_gallery_album_progress_bar.png b/res/edje/images/T01_gallery_album_progress_bar.png
similarity index 100%
rename from res/black_theme/edc/images/T01_gallery_album_progress_bar.png
rename to res/edje/images/T01_gallery_album_progress_bar.png

diff --git a/res/black_theme/images_edc/T01_icon_add_folder.png b/res/edje/images/T01_icon_add_folder.png
similarity index 100%
rename from res/black_theme/images_edc/T01_icon_add_folder.png
rename to res/edje/images/T01_icon_add_folder.png

diff --git a/res/black_theme/images_edc/T01_icon_back.png b/res/edje/images/T01_icon_back.png
similarity index 100%
rename from res/black_theme/images_edc/T01_icon_back.png
rename to res/edje/images/T01_icon_back.png

diff --git a/res/black_theme/images_edc/T01_icon_bustshot_45x45.PNG b/res/edje/images/T01_icon_bustshot_45x45.PNG
similarity index 100%
rename from res/black_theme/images_edc/T01_icon_bustshot_45x45.PNG
rename to res/edje/images/T01_icon_bustshot_45x45.PNG

diff --git a/res/black_theme/images_edc/T01_icon_camera_all.png b/res/edje/images/T01_icon_camera_all.png
similarity index 100%
rename from res/black_theme/images_edc/T01_icon_camera_all.png
rename to res/edje/images/T01_icon_camera_all.png

diff --git a/res/black_theme/images_edc/T01_icon_lock.png b/res/edje/images/T01_icon_lock.png
similarity index 100%
rename from res/black_theme/images_edc/T01_icon_lock.png
rename to res/edje/images/T01_icon_lock.png

diff --git a/res/black_theme/images_edc/T01_icon_panorama.png b/res/edje/images/T01_icon_panorama.png
similarity index 100%
rename from res/black_theme/images_edc/T01_icon_panorama.png
rename to res/edje/images/T01_icon_panorama.png

diff --git a/res/black_theme/images_edc/T01_icon_share.png b/res/edje/images/T01_icon_share.png
similarity index 100%
rename from res/black_theme/images_edc/T01_icon_share.png
rename to res/edje/images/T01_icon_share.png

diff --git a/res/black_theme/images_edc/T01_icon_sound_shot.png b/res/edje/images/T01_icon_sound_shot.png
similarity index 100%
rename from res/black_theme/images_edc/T01_icon_sound_shot.png
rename to res/edje/images/T01_icon_sound_shot.png

diff --git a/res/black_theme/images_edc/T01_icon_thumbnail_bookmark.png b/res/edje/images/T01_icon_thumbnail_bookmark.png
similarity index 100%
rename from res/black_theme/images_edc/T01_icon_thumbnail_bookmark.png
rename to res/edje/images/T01_icon_thumbnail_bookmark.png

diff --git a/res/black_theme/edc/images/T01_nocontents_videos.png b/res/edje/images/T01_nocontents_videos.png
similarity index 100%
rename from res/black_theme/edc/images/T01_nocontents_videos.png
rename to res/edje/images/T01_nocontents_videos.png

diff --git a/res/black_theme/images_edc/T01_popup_copy.png b/res/edje/images/T01_popup_copy.png
similarity index 100%
rename from res/black_theme/images_edc/T01_popup_copy.png
rename to res/edje/images/T01_popup_copy.png

diff --git a/res/black_theme/images_edc/T01_popup_icon_delete.png b/res/edje/images/T01_popup_icon_delete.png
similarity index 100%
rename from res/black_theme/images_edc/T01_popup_icon_delete.png
rename to res/edje/images/T01_popup_icon_delete.png

diff --git a/res/black_theme/images_edc/T01_popup_icon_done.png b/res/edje/images/T01_popup_icon_done.png
similarity index 100%
rename from res/black_theme/images_edc/T01_popup_icon_done.png
rename to res/edje/images/T01_popup_icon_done.png

diff --git a/res/black_theme/images_edc/T01_popup_icon_edit.png b/res/edje/images/T01_popup_icon_edit.png
similarity index 100%
rename from res/black_theme/images_edc/T01_popup_icon_edit.png
rename to res/edje/images/T01_popup_icon_edit.png

diff --git a/res/black_theme/images_edc/T01_popup_icon_new_album.png b/res/edje/images/T01_popup_icon_new_album.png
similarity index 100%
rename from res/black_theme/images_edc/T01_popup_icon_new_album.png
rename to res/edje/images/T01_popup_icon_new_album.png

diff --git a/res/black_theme/images_edc/T01_popup_icon_rename.png b/res/edje/images/T01_popup_icon_rename.png
similarity index 100%
rename from res/black_theme/images_edc/T01_popup_icon_rename.png
rename to res/edje/images/T01_popup_icon_rename.png

diff --git a/res/black_theme/images_edc/T01_popup_icon_rotate_left.png b/res/edje/images/T01_popup_icon_rotate_left.png
similarity index 100%
rename from res/black_theme/images_edc/T01_popup_icon_rotate_left.png
rename to res/edje/images/T01_popup_icon_rotate_left.png

diff --git a/res/black_theme/images_edc/T01_popup_icon_rotate_right.png b/res/edje/images/T01_popup_icon_rotate_right.png
similarity index 100%
rename from res/black_theme/images_edc/T01_popup_icon_rotate_right.png
rename to res/edje/images/T01_popup_icon_rotate_right.png

diff --git a/res/black_theme/images_edc/T01_popup_icon_slideshow.png b/res/edje/images/T01_popup_icon_slideshow.png
similarity index 100%
rename from res/black_theme/images_edc/T01_popup_icon_slideshow.png
rename to res/edje/images/T01_popup_icon_slideshow.png

diff --git a/res/black_theme/images_edc/T01_popup_move.png b/res/edje/images/T01_popup_move.png
similarity index 100%
rename from res/black_theme/images_edc/T01_popup_move.png
rename to res/edje/images/T01_popup_move.png

diff --git a/res/black_theme/edc/images/T01_thumbs_bustshot_bg.png b/res/edje/images/T01_thumbs_bustshot_bg.png
similarity index 100%
rename from res/black_theme/edc/images/T01_thumbs_bustshot_bg.png
rename to res/edje/images/T01_thumbs_bustshot_bg.png

diff --git a/res/black_theme/images_edc/T01_title_icon_select_all.png b/res/edje/images/T01_title_icon_select_all.png
similarity index 100%
rename from res/black_theme/images_edc/T01_title_icon_select_all.png
rename to res/edje/images/T01_title_icon_select_all.png

diff --git a/res/black_theme/edc/images/T01_video_play.png b/res/edje/images/T01_video_play.png
similarity index 100%
rename from res/black_theme/edc/images/T01_video_play.png
rename to res/edje/images/T01_video_play.png

diff --git a/res/black_theme/images_edc/T02_popup_icon_edit_image.png b/res/edje/images/T02_popup_icon_edit_image.png
similarity index 100%
rename from res/black_theme/images_edc/T02_popup_icon_edit_image.png
rename to res/edje/images/T02_popup_icon_edit_image.png

diff --git a/res/black_theme/images_edc/T02_popup_icon_settings.png b/res/edje/images/T02_popup_icon_settings.png
similarity index 100%
rename from res/black_theme/images_edc/T02_popup_icon_settings.png
rename to res/edje/images/T02_popup_icon_settings.png

diff --git a/res/black_theme/edc/images/core_pattern_empty_bg.png b/res/edje/images/core_pattern_empty_bg.png
similarity index 100%
rename from res/black_theme/edc/images/core_pattern_empty_bg.png
rename to res/edje/images/core_pattern_empty_bg.png

diff --git a/res/black_theme/edc/images/core_pattern_empty_bg_h.png b/res/edje/images/core_pattern_empty_bg_h.png
similarity index 100%
rename from res/black_theme/edc/images/core_pattern_empty_bg_h.png
rename to res/edje/images/core_pattern_empty_bg_h.png

diff --git a/res/black_theme/edc/images/gallery_icon_container.png b/res/edje/images/gallery_icon_container.png
similarity index 100%
rename from res/black_theme/edc/images/gallery_icon_container.png
rename to res/edje/images/gallery_icon_container.png

diff --git a/res/black_theme/edc/images/gallery_icon_full.png b/res/edje/images/gallery_icon_full.png
similarity index 100%
rename from res/black_theme/edc/images/gallery_icon_full.png
rename to res/edje/images/gallery_icon_full.png

diff --git a/res/black_theme/images_edc/gallery_list_icon_folder.png b/res/edje/images/gallery_list_icon_folder.png
similarity index 100%
rename from res/black_theme/images_edc/gallery_list_icon_folder.png
rename to res/edje/images/gallery_list_icon_folder.png

diff --git a/res/black_theme/images_edc/gallery_list_icon_my_files_sd_card.png b/res/edje/images/gallery_list_icon_my_files_sd_card.png
similarity index 100%
rename from res/black_theme/images_edc/gallery_list_icon_my_files_sd_card.png
rename to res/edje/images/gallery_list_icon_my_files_sd_card.png

diff --git a/res/black_theme/edc/sounds/S_Touch_30ms.wav b/res/edje/sounds/S_Touch_30ms.wav
similarity index 100%
rename from res/black_theme/edc/sounds/S_Touch_30ms.wav
rename to res/edje/sounds/S_Touch_30ms.wav

diff --git a/res/black_theme/edc/sounds/button-pressed.wav b/res/edje/sounds/button-pressed.wav
similarity index 100%
rename from res/black_theme/edc/sounds/button-pressed.wav
rename to res/edje/sounds/button-pressed.wav