Paths updated in setting-password project

Change-Id: Idb21a8032ec8d19e9a7f795fee730a568f662f27
Signed-off-by: Michal Skorupinski <m.skorupinsk@samsung.com>

diff --git a/setting-main/.project b/setting-main/.project
index 54f394551f6c0b0aae2e628df336b58130342e2a..6487efaee6de267ba87e141f3773bb5fa5597a3d 100644 (file)
--- a/setting-main/.project
+++ b/setting-main/.project
@@ -3,8 +3,8 @@
        <name>setting-main</name>
        <comment></comment>
        <projects>
-               <project>setting-about</project>
-               <project>setting-connectivity</project>
+               <project>setting-locktype</project>
+               <project>setting-password</project>
                <project>setting-common</project>
        </projects>
        <buildSpec>

diff --git a/setting-main/.tproject b/setting-main/.tproject
index 62cc4a45a6920f7356fa34ba00f96d77c246c124..dc5cbf46f9e4db214eb739830ba1777f9b53bf8d 100644 (file)
--- a/setting-main/.tproject
+++ b/setting-main/.tproject
@@ -10,8 +10,8 @@
         <referencedProject project="setting-common" path="lib"/>
         <resFallback autoGen="true"/>
         <subProjects>
-            <tizenProject project="setting-about"/>
-            <tizenProject project="setting-connectivity"/>
+            <tizenProject project="setting-locktype"/>
+            <tizenProject project="setting-password"/>
         </subProjects>
     </package>
 </tproject>

diff --git a/setting-password/.project b/setting-password/.project
index 29b61c199fd748891b0ba26f852951a332d558ec..ed2c5864babbc4355c0e9484f17f9b31647dd215 100644 (file)
--- a/setting-password/.project
+++ b/setting-password/.project
@@ -6,6 +6,11 @@
                <project>setting-common</project>
        </projects>
        <buildSpec>
+               <buildCommand>
+                       <name>org.tizen.nativecore.apichecker.apicheckerbuilder</name>
+                       <arguments>
+                       </arguments>
+               </buildCommand>
                <buildCommand>
                        <name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
                        <arguments>
@@ -23,6 +28,7 @@
                <nature>org.eclipse.cdt.core.ccnature</nature>
                <nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
                <nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
+               <nature>org.tizen.nativecore.apichecker.apicheckernature</nature>
        </natures>
        <filteredResources>
                <filter>

diff --git a/setting-password/src/setting-password-normal.c b/setting-password/src/setting-password-normal.c
index 22f8f05ddaf37c5340942143d9927c056798d1c1..4d2a7e432e2ee6d3151b9545dd3dc3bb6bfb66f4 100755 (executable)
--- a/setting-password/src/setting-password-normal.c
+++ b/setting-password/src/setting-password-normal.c
@@ -128,8 +128,7 @@ static int _view_create(void *cb)
        setting_add_back_button(&ad->md, _cancel_cb, ad);
 
        ad->bottom_btn = elm_box_add(ad->md.naviframe);
-       elm_box_padding_set(ad->bottom_btn, ELM_SCALE_SIZE(10),
-                       ELM_SCALE_SIZE(10));
+       elm_box_padding_set(ad->bottom_btn, ELM_SCALE_SIZE(10), ELM_SCALE_SIZE(10));
        elm_box_horizontal_set(ad->bottom_btn, EINA_TRUE);
        evas_object_size_hint_weight_set(ad->bottom_btn, EVAS_HINT_EXPAND,
        EVAS_HINT_EXPAND);

diff --git a/setting-password/src/setting-password-simple.c b/setting-password/src/setting-password-simple.c
index c56c651074f8bc410d8287131e6db0533ad5adee..fcc77965b7d72dfb8ffe70726cb506fc9d982898 100644 (file)
--- a/setting-password/src/setting-password-simple.c
+++ b/setting-password/src/setting-password-simple.c
@@ -228,8 +228,7 @@ static int _handle_step2(void *data, int *step, char *collection1,
                 * collection_step2 */
                if (safeStrNCmp(collection1, collection2, 4) == 0) {
                        ecore_imf_context_input_panel_hide(ad->imf_context);
-                       ret = set_password(ad->cur_pwd,
-                                       collection1, ad);
+                       ret = set_password(ad->cur_pwd, collection1, ad);
 
                        if (SETTING_RETURN_SUCCESS == ret) {
                                FREE(ad->step1_str);
@@ -540,8 +539,9 @@ static int _view_create(void *cb)
        ret = view_init_wo_genlist(&ad->md, _("IDS_ST_BODY_SIMPLE_PASSWORD"));
        retv_if(ret != SETTING_RETURN_SUCCESS, ret);
 
-       elm_layout_file_set(ad->md.layout, SETTING_THEME_EDJ_NAME,
-                       "layout/simple_password");
+       char *path = get_resource_path(SETTING_THEME_EDJ_NAME);
+       elm_layout_file_set(ad->md.layout, path, "layout/simple_password");
+       free(path);
 
        ad->sp_entry1 = elm_entry_add(ad->md.layout);
        elm_object_style_set(ad->sp_entry1 , "popup");

diff --git a/setting-password/src/setting-password.c b/setting-password/src/setting-password.c
index be633903950dc86e454eb5c724541d03ad0472b8..c01e1d93354a67a6605ecdfcc6f37d32776c3fb4 100644 (file)
--- a/setting-password/src/setting-password.c
+++ b/setting-password/src/setting-password.c
@@ -347,7 +347,11 @@ static bool on_app_create(void *priv)
        evas_object_smart_callback_add(ad->md.window, "wm,rotation,changed",
                        setting_password_rotated_cb, ad);
 
-       elm_theme_extension_add(NULL, EDJDIR"/gl-item-entry-main.edj");
+
+       char *path = get_resource_path(EDJDIR"/gl-item-entry-main.edj");
+       elm_theme_extension_add(NULL, path);
+       free(path);
+
        setting_create_Gendial_itc(SETTING_GENLIST_GROUP_INDEX_STYLE,
                        &(ad->itc_title));
        setting_create_Gendial_itc(SETTING_GENLIST_1ICON_STYLE,

diff --git a/setting-password/tizen-manifest.xml b/setting-password/tizen-manifest.xml
index f735a70934176c5c578c2fc3f50c646e1ecdcd35..ea87697c74edd106c0c810eaa6a57a0848a6601b 100644 (file)
--- a/setting-password/tizen-manifest.xml
+++ b/setting-password/tizen-manifest.xml
@@ -1,60 +1,52 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <manifest xmlns="http://tizen.org/ns/packages" api-version="4.0" package="org.tizen.setting-password" version="1.0.0">
-       <profile name="mobile"/>
-       <ui-application appid="org.tizen.setting-password" exec="setting-password" nodisplay="true" multiple="true" type="capp" taskmanage="false" hw-acceleration="on" launch_mode="caller">
-               <metadata key="http://developer.samsung.com/tizen/metadata/legacylifecycle"/>
-               <label>Password</label>
-               <label xml:lang="en-us">Password</label>
-       </ui-application>
-       <privileges>
-               <privilege>http://tizen.org/privilege/appmanager.launch</privilege>
-               <privilege>http://tizen.org/privilege/appmanager.kill</privilege>
-               <privilege>http://tizen.org/privilege/appmanager.kill.bgapp</privilege>
-               <privilege>http://tizen.org/privilege/account.read</privilege>
-               <privilege>http://tizen.org/privilege/account.write</privilege>
-               <privilege>http://tizen.org/privilege/notification</privilege>
-               <privilege>http://tizen.org/privilege/volume.set</privilege>
-               <privilege>http://tizen.org/privilege/haptic</privilege>
-               <privilege>http://tizen.org/privilege/telephony.admin</privilege>
-               <privilege>http://tizen.org/privilege/telephony</privilege>
-               <privilege>http://tizen.org/privilege/tethering.admin</privilege>
-
-               <privilege>http://tizen.org/privilege/display</privilege>
-               <privilege>http://tizen.org/privilege/nfc.admin</privilege>
-
-               <privilege>http://tizen.org/privilege/packagemanager.install</privilege>
-               <privilege>http://tizen.org/privilege/packagemanager.admin</privilege>
-               <privilege>http://tizen.org/privilege/packagemanager.info</privilege>
-               <privilege>http://tizen.org/privilege/packagemanager.clearcache</privilege>
-
-               <privilege>http://tizen.org/privilege/systemsettings.admin</privilege>
-               <privilege>http://tizen.org/privilege/system</privilege>
-               <privilege>http://tizen.org/privilege/systemmanager</privilege>
-               <privilege>http://tizen.org/privilege/systemmonitor</privilege>
-
-               <privilege>http://tizen.org/privilege/application.launch</privilege>
-               <privilege>http://tizen.org/privilege/content.read</privilege>
-               <privilege>http://tizen.org/privilege/filesystem.read</privilege>
-               <privilege>http://tizen.org/privilege/filesystem.write</privilege>
-               <privilege>http://tizen.org/privilege/fullscreen</privilege>
-
-               <privilege>http://tizen.org/privilege/http</privilege>
-               <privilege>http://tizen.org/privilege/ime</privilege>
-               <privilege>http://tizen.org/privilege/internet</privilege>
-               <privilege>http://tizen.org/privilege/mediastorage</privilege>
-               <privilege>http://tizen.org/privilege/externalstorage</privilege>
-               <privilege>http://tizen.org/privilege/externalstorage.appdata</privilege>
-               <privilege>http://tizen.org/privilege/datasharing</privilege>
-
-               <privilege>http://tizen.org/privilege/network.get</privilege>
-               <privilege>http://tizen.org/privilege/network.profile</privilege>
-               <privilege>http://tizen.org/privilege/network.set</privilege>
-               <privilege>http://tizen.org/privilege/package.info</privilege>
-
-               <privilege>http://tizen.org/privilege/apphistory.read</privilege>
-               <privilege>http://tizen.org/privilege/mediahistory.read</privilege>
-
-               <privilege>http://tizen.org/privilege/alarm.set</privilege>
-
-               <privilege>http://tizen.org/privilege/dpm.password</privilege>
-       </privileges>
-</manifest>
\ No newline at end of file
+    <profile name="mobile"/>
+    <ui-application appid="org.tizen.setting-password" exec="setting-password" hw-acceleration="on" launch_mode="caller" multiple="true" nodisplay="true" taskmanage="false" type="capp">
+        <label>Password</label>
+        <label xml:lang="en-us">Password</label>
+        <metadata key="http://developer.samsung.com/tizen/metadata/legacylifecycle"/>
+    </ui-application>
+    <privileges>
+        <privilege>http://tizen.org/privilege/apphistory.read</privilege>
+        <privilege>http://tizen.org/privilege/account.read</privilege>
+        <privilege>http://tizen.org/privilege/mediahistory.read</privilege>
+        <privilege>http://tizen.org/privilege/haptic</privilege>
+        <privilege>http://tizen.org/privilege/display</privilege>
+        <privilege>http://tizen.org/privilege/datasharing</privilege>
+        <privilege>http://tizen.org/privilege/packagemanager.info</privilege>
+        <privilege>http://tizen.org/privilege/application.launch</privilege>
+        <privilege>http://tizen.org/privilege/packagemanager.install</privilege>
+        <privilege>http://tizen.org/privilege/mediastorage</privilege>
+        <privilege>http://tizen.org/privilege/telephony.admin</privilege>
+        <privilege>http://tizen.org/privilege/network.get</privilege>
+        <privilege>http://tizen.org/privilege/appmanager.kill</privilege>
+        <privilege>http://tizen.org/privilege/package.info</privilege>
+        <privilege>http://tizen.org/privilege/system</privilege>
+        <privilege>http://tizen.org/privilege/alarm.set</privilege>
+        <privilege>http://tizen.org/privilege/http</privilege>
+        <privilege>http://tizen.org/privilege/externalstorage.appdata</privilege>
+        <privilege>http://tizen.org/privilege/network.profile</privilege>
+        <privilege>http://tizen.org/privilege/fullscreen</privilege>
+        <privilege>http://tizen.org/privilege/telephony</privilege>
+        <privilege>http://tizen.org/privilege/packagemanager.clearcache</privilege>
+        <privilege>http://tizen.org/privilege/systemmonitor</privilege>
+        <privilege>http://tizen.org/privilege/systemsettings.admin</privilege>
+        <privilege>http://tizen.org/privilege/content.read</privilege>
+        <privilege>http://tizen.org/privilege/network.set</privilege>
+        <privilege>http://tizen.org/privilege/account.write</privilege>
+        <privilege>http://tizen.org/privilege/nfc.admin</privilege>
+        <privilege>http://tizen.org/privilege/filesystem.write</privilege>
+        <privilege>http://tizen.org/privilege/tethering.admin</privilege>
+        <privilege>http://tizen.org/privilege/ime</privilege>
+        <privilege>http://tizen.org/privilege/dpm.password</privilege>
+        <privilege>http://tizen.org/privilege/externalstorage</privilege>
+        <privilege>http://tizen.org/privilege/systemmanager</privilege>
+        <privilege>http://tizen.org/privilege/appmanager.kill.bgapp</privilege>
+        <privilege>http://tizen.org/privilege/appmanager.launch</privilege>
+        <privilege>http://tizen.org/privilege/filesystem.read</privilege>
+        <privilege>http://tizen.org/privilege/volume.set</privilege>
+        <privilege>http://tizen.org/privilege/internet</privilege>
+        <privilege>http://tizen.org/privilege/notification</privilege>
+        <privilege>http://tizen.org/privilege/packagemanager.admin</privilege>
+    </privileges>
+</manifest>