Loading a proper layout in smartmanager-battery project

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

diff --git a/setting-common/inc/setting-common-general-func.h b/setting-common/inc/setting-common-general-func.h
index 57a0d30028bca2d00d829431f224928eb724510a..fb21ee06dc5d2c80cd3a8e90756ad925bc052a20 100755 (executable)
--- a/setting-common/inc/setting-common-general-func.h
+++ b/setting-common/inc/setting-common-general-func.h
@@ -76,5 +76,6 @@ char *get_resource_path(const char *name);
 char *get_data_path(char *name);
 char *get_shared_path(char *name);
 char *get_globaluser_data(char *name);
+void set_layout_file(Evas_Object *layout, char *name, char *group);
 
 #endif                         /* __SETTING_COMMON_GENERAL_FUNC_H__ */

diff --git a/setting-common/src/setting-common-general-func.c b/setting-common/src/setting-common-general-func.c
index 306b6b15298d59763217fcc74c68358370dba1e7..68e0c9412d119313b8ffabcd303feac5691c7e9c 100755 (executable)
--- a/setting-common/src/setting-common-general-func.c
+++ b/setting-common/src/setting-common-general-func.c
@@ -1008,3 +1008,15 @@ char *get_shared_path(char *name)
        free(data);
        return final_path;
 }
+
+EXPORT_PUBLIC
+void set_layout_file(Evas_Object *layout, char *name, char *group)
+{
+       char *path = get_resource_path(name);
+       bool ret = elm_layout_file_set(layout, path, group);
+       if (!ret) {
+               SETTING_TRACE_ERROR("Failed to load edj file. Name: %s, group: %s", name, group);
+       }
+
+       free(path);
+}

diff --git a/setting-display/src/setting-display-brightness.c b/setting-display/src/setting-display-brightness.c
index 08120c87dff7f3203880ee6bd2d5d97bcf306c7f..dcb0bac4f20d37efa0e2da2b68ff31403f2ca117 100755 (executable)
--- a/setting-display/src/setting-display-brightness.c
+++ b/setting-display/src/setting-display-brightness.c
@@ -106,17 +106,6 @@ static int settings_display_util_set_brightness(int value)
        return 0;
 }
 
-static void set_layout_file(Evas_Object *layout, char *name, char *group)
-{
-       char *path = get_resource_path(name);
-       Eina_Bool ret = elm_layout_file_set(layout, path, group);
-       if (!ret) {
-               SETTING_TRACE_ERROR("Failed to load edj file. Name: %s, group: %s", name, group);
-       }
-
-       free(path);
-}
-
 static void update_overheating_text(void *data)
 {
        SettingDisplay *ad = (SettingDisplay *)data;

diff --git a/setting-display/tizen-manifest.xml b/setting-display/tizen-manifest.xml
index 01138fc4aa9a3ad6140d3fdad0abd342bc2e1533..5850f0aca74d4a418de47ef240c5fdfb6381848e 100644 (file)
--- a/setting-display/tizen-manifest.xml
+++ b/setting-display/tizen-manifest.xml
@@ -1,59 +1,51 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <manifest xmlns="http://tizen.org/ns/packages" api-version="4.0" package="org.tizen.setting-display" version="1.0.0">
-       <profile name="mobile"/>
-       <ui-application appid="org.tizen.setting-display" exec="setting-display" type="capp" nodisplay="true" taskmanage="false" hw-acceleration="on" launch_mode="caller">
-                       <label>Display</label>
-                       <label xml:lang="en-us">Display</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>
+    <profile name="mobile"/>
+    <ui-application appid="org.tizen.setting-display" exec="setting-display" hw-acceleration="on" launch_mode="caller" nodisplay="true" taskmanage="false" type="capp">
+        <label>Display</label>
+        <label xml:lang="en-us">Display</label>
+    </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>

diff --git a/setting-font/src/setting-font-main.c b/setting-font/src/setting-font-main.c
index e4f793f82206b7693f36ef6ff4919502c06e690c..a108724010d16ee92835ee2111913c502c536b8d 100755 (executable)
--- a/setting-font/src/setting-font-main.c
+++ b/setting-font/src/setting-font-main.c
@@ -222,8 +222,7 @@ static Evas_Object *_font_size_slider_get(void *data, Evas_Object *obj,
                        SETTING_TRACE("Add 5Step Slider");
 
                        Evas_Object *layout = elm_layout_add(obj);
-                       Eina_Bool
-                       ret = elm_layout_file_set(layout,
+                       bool ret = elm_layout_file_set(layout,
                                        EDJDIR"/setting-theme.edj",
                                        "font_slider");
                        if (ret == EINA_TRUE) { /* error condition */

diff --git a/setting-main/.tproject b/setting-main/.tproject
index 4f31900eab1440ff44e624f2e5ced2d39aa37071..17182cdfd7f7ed3e642390e0e9ee666188fc0547 100644 (file)
--- a/setting-main/.tproject
+++ b/setting-main/.tproject
@@ -8,6 +8,8 @@
     <package>
         <blacklist/>
         <referencedProject project="setting-common" path="lib"/>
+        <referencedProject project="setting-profile-common" path="lib"/>
+        <referencedProject project="setting-smartmanager" path="lib"/>
         <resFallback autoGen="true"/>
         <subProjects>
             <tizenProject project="setting-about"/>

diff --git a/smartmanager-battery/src/smartmanager-battery-main.c b/smartmanager-battery/src/smartmanager-battery-main.c
index dceb2fb24df00c9923bf2178d79f73fc44d777b6..af9e3ec189cdd125e6d1b26ddc1a29786cadd1f1 100644 (file)
--- a/smartmanager-battery/src/smartmanager-battery-main.c
+++ b/smartmanager-battery/src/smartmanager-battery-main.c
@@ -94,8 +94,7 @@ static Evas_Object *_itc_battery_info_content_get(
                progressbar_style = "custom_red";
 
        layout = elm_layout_add(obj);
-       elm_layout_file_set(layout, EDJDIR"/setting-theme.edj",
-                               "gl_custom_item_battery");
+       set_layout_file(layout, EDJDIR"/setting-theme.edj", "gl_custom_item_battery");
        evas_object_size_hint_align_set(layout, EVAS_HINT_FILL, EVAS_HINT_FILL);
 
        progress = elm_progressbar_add(layout);
@@ -131,8 +130,7 @@ static Evas_Object *_itc_app_batt_usage_content_get(void *data,
                return NULL;
 
        layout = elm_layout_add(obj);
-       elm_layout_file_set(layout, EDJDIR"/setting-theme.edj",
-                                               "gl_custom_item_icon");
+       set_layout_file(layout, EDJDIR"/setting-theme.edj", "gl_custom_item_icon");
        evas_object_size_hint_align_set(layout, EVAS_HINT_FILL, EVAS_HINT_FILL);
 
        progress = elm_progressbar_add(layout);
@@ -150,6 +148,7 @@ static Evas_Object *_itc_app_batt_usage_content_get(void *data,
 
        icon = elm_icon_add(layout);
        elm_image_file_set(icon, app_info->icon, NULL);
+
        elm_image_resizable_set(icon, EINA_TRUE, EINA_TRUE);
        evas_object_size_hint_min_set(icon, 98, 98);
        elm_object_part_content_set(layout, "elm.swallow.icon", icon);