Change menu list for BT model in Connections.

Change-Id: Ia220109704e7b086a18484874db43b221ec13b04
Signed-off-by: jinwang.an <jinwang.an@samsung.com>

diff --git a/src/setting-connection.c b/src/setting-connection.c
index b004b010638283046c528ea1510e31e2159b20c9..4c9bbd71960cc6767a04ac5bc23a4228b3b622aa 100644 (file)
--- a/src/setting-connection.c
+++ b/src/setting-connection.c
@@ -760,8 +760,11 @@ Evas_Object *_create_connection_list(void *data)
 
 
        for (idx = 0; idx < CONNECT_TOP_MENU_SIZE; idx++) {
-               if (connection_menu_its[idx].type == SETTING_CONNECTION_FLIGHT_MODE && !is_supported_telephony) {
-                       continue;
+               if(!is_supported_telephony) {
+                       if(connection_menu_its[idx].type == SETTING_CONNECTION_DATAUSAGE ||
+                               connection_menu_its[idx].type == SETTING_CONNECTION_MOBILE_NETWORKS ||
+                               connection_menu_its[idx].type == SETTING_CONNECTION_FLIGHT_MODE)
+                               continue;
                }
 
                switch (connection_menu_its[idx].type) {

diff --git a/src/setting-volume-page.c b/src/setting-volume-page.c
index 91dde2f0265a0409982aa77b55777cd501b2b10a..f8fb9d5fbc71ab3c6c391b06ddfa8dae530ec1d0 100644 (file)
--- a/src/setting-volume-page.c
+++ b/src/setting-volume-page.c
@@ -518,7 +518,7 @@ _value_changed_rotary_drag_tap(void *data, Evas_Object *obj, void *event_info)
        elm_object_part_text_set(pd->page_layout[cur_page], "elm.text.slider", buf);
 
        change_volume_page(data, cur_page);
-       return EINA_TRUE;
+       return;
 }
 
 void _clear_volume_setting_cb(void *data, Evas_Object *obj, void *event_info)