Fix app_control extra data type for Settings application without rotation

Change-Id: Idbc7e1ee1823500fc7e286b0bb610bb618eb27bb

diff --git a/im_setting_list/input_method_setting_list_ui.cpp b/im_setting_list/input_method_setting_list_ui.cpp
index 0b66191..057e2aa 100644 (file)
--- a/im_setting_list/input_method_setting_list_ui.cpp
+++ b/im_setting_list/input_method_setting_list_ui.cpp
@@ -153,8 +153,8 @@ im_setting_list_main_window_create(const char *name, int app_type)
         elm_win_conformant_set(eo, EINA_TRUE);
         elm_win_autodel_set(eo, EINA_TRUE);
         elm_win_screen_size_get(eo, NULL, NULL, &w, &h);
-        if(w == -1 || h == -1){
-           LOGD("elm_win_screen_size_get() is failed\n");
+        if (w == -1 || h == -1) {
+           LOGW("elm_win_screen_size_get() is failed\n");
            return NULL;
         }
         evas_object_resize(eo, w, h);
@@ -198,12 +198,12 @@ static void im_setting_list_load_ime_info(void)
     ime_info_s *info = NULL;
     g_ime_info_list.clear();
     int cnt = isf_control_get_all_ime_info(&info);
-    if(info)
+    if (info)
     {
         for(int i=0; i<cnt; ++i)
         {
             SECURE_LOGD("%s %s %d %d %d", info[i].appid, info[i].label, info[i].is_enabled, info[i].is_preinstalled, info[i].has_option);
-            if(info[i].is_preinstalled)
+            if (info[i].is_preinstalled)
             {
                 ime_info_list_preinstall.push_back(info[i]);
             }
@@ -229,12 +229,12 @@ static int im_setting_list_get_active_ime_index(void)
     std::vector<ime_info_s>::iterator end = g_ime_info_list.end();
     for (; iter != end; ++iter)
     {
-        if(active_ime_appid && (!strcmp(active_ime_appid, iter->appid)))
+        if (active_ime_appid && (!strcmp(active_ime_appid, iter->appid)))
         {
             break;
         }
     }
-    if(active_ime_appid)
+    if (active_ime_appid)
     {
         free(active_ime_appid);
     }
@@ -361,7 +361,7 @@ static void im_setting_list_check_button_change_cb(void *data, Evas_Object *obj,
     int index = (int)reinterpret_cast<long>(data);
     Eina_Bool state = g_gen_item_data[index].chk_status;
 
-    if(!state)
+    if (!state)
     {
         isf_control_set_enable_ime(g_ime_info_list[index].appid, state);
     }
@@ -398,18 +398,18 @@ static void im_setting_list_item_sel_cb(void *data, Evas_Object *obj, void *even
     elm_genlist_item_selected_set (item, EINA_FALSE);
 
     int index = (int)reinterpret_cast<long>(data);
-    if(g_ime_info_list[index].is_preinstalled || (index == g_active_ime_index))
+    if (g_ime_info_list[index].is_preinstalled || (index == g_active_ime_index))
     {
         return;
     }
 
     Evas_Object *ck = elm_object_item_part_content_get (item, "elm.icon.right");
-    if (ck == NULL){
+    if (ck == NULL) {
         ck = elm_object_item_part_content_get (item, "elm.icon");
     }
     Eina_Bool state = g_gen_item_data[index].chk_status;
 
-    if(state)
+    if (state)
     {
         g_gen_item_data[index].chk_status = !state;
         isf_control_set_enable_ime(g_ime_info_list[index].appid, !state);
@@ -575,10 +575,10 @@ static char *im_setting_list_genlist_item_one_line_label_get(void *data, Evas_Ob
 
 static void im_setting_list_genlist_item_class_create(int app_type)
 {
-    if(NULL == itc_im_list_group)
+    if (NULL == itc_im_list_group)
     {
         itc_im_list_group = elm_genlist_item_class_new();
-        if(itc_im_list_group)
+        if (itc_im_list_group)
         {
             itc_im_list_group->item_style = "groupindex";
             itc_im_list_group->func.text_get = im_setting_list_genlist_group_label_get;
@@ -588,7 +588,7 @@ static void im_setting_list_genlist_item_class_create(int app_type)
         }
     }
 
-    if(NULL == itc_im_list_keyboard_list)
+    if (NULL == itc_im_list_keyboard_list)
     {
         itc_im_list_keyboard_list = elm_genlist_item_class_new();
         if (itc_im_list_keyboard_list)
@@ -605,9 +605,9 @@ static void im_setting_list_genlist_item_class_create(int app_type)
         }
     }
 
-    if(app_type == APP_TYPE_SETTING)
+    if (app_type == APP_TYPE_SETTING || app_type == APP_TYPE_SETTING_NO_ROTATION)
     {
-        if(NULL == itc_im_list_item)
+        if (NULL == itc_im_list_item)
         {
             itc_im_list_item = elm_genlist_item_class_new();
             if (itc_im_list_item)
@@ -624,7 +624,7 @@ static void im_setting_list_genlist_item_class_create(int app_type)
             }
         }
 
-        if(NULL == itc_im_list_item_one_line)
+        if (NULL == itc_im_list_item_one_line)
         {
             itc_im_list_item_one_line = elm_genlist_item_class_new();
             if (itc_im_list_item_one_line)
@@ -648,16 +648,15 @@ static void im_setting_list_add_ime(void *data) {
     int i = 0;
     im_setting_list_genlist_item_class_create(ad->app_type);
 
-    if(NULL != ad->genlist)
+    if (NULL != ad->genlist)
     {
         elm_genlist_clear(ad->genlist);
     }
 
     g_active_ime_index = im_setting_list_get_active_ime_index();
-//    list_item_text item_text;
     memset(&item_text, 0, sizeof(item_text));
     Elm_Object_Item * group_header_item = NULL;
-    if(ad->app_type == APP_TYPE_SETTING)
+    if (ad->app_type == APP_TYPE_SETTING || ad->app_type == APP_TYPE_SETTING_NO_ROTATION)
     {
         group_header_item = elm_genlist_item_append(ad->genlist,
             itc_im_list_group,
@@ -704,7 +703,7 @@ static void im_setting_list_add_ime(void *data) {
     for (i = 0; i < info_list_size; i++) {
         gen_item_data item_data;
 
-        if(g_ime_info_list[i].is_preinstalled || (i == g_active_ime_index)){
+        if (g_ime_info_list[i].is_preinstalled || (i == g_active_ime_index)) {
             item_data.chk_status = EINA_TRUE;
         }else{
             item_data.chk_status = g_ime_info_list[i].is_enabled;
@@ -719,7 +718,7 @@ static void im_setting_list_add_ime(void *data) {
             im_setting_list_item_sel_cb,
             (void *)(i));
 
-        if(g_ime_info_list[i].is_preinstalled || (i == g_active_ime_index)){
+        if (g_ime_info_list[i].is_preinstalled || (i == g_active_ime_index)) {
             elm_object_item_disabled_set(item, EINA_TRUE);
         }
 
@@ -774,19 +773,19 @@ void im_setting_list_app_terminate(void *data)
 {
     g_ime_info_list.clear();
     g_gen_item_data.clear();
-    if(NULL != itc_im_list_keyboard_list)
+    if (NULL != itc_im_list_keyboard_list)
     {
         elm_genlist_item_class_free(itc_im_list_keyboard_list);
         itc_im_list_keyboard_list = NULL;
     }
 
-    if(NULL != itc_im_list_group)
+    if (NULL != itc_im_list_group)
     {
         elm_genlist_item_class_free(itc_im_list_group);
         itc_im_list_group = NULL;
     }
 
-    if(NULL != itc_im_list_item)
+    if (NULL != itc_im_list_item)
     {
         elm_genlist_item_class_free(itc_im_list_item);
         itc_im_list_item = NULL;

diff --git a/im_setting_selector/input_method_setting_selector_ui.cpp b/im_setting_selector/input_method_setting_selector_ui.cpp
index c821c29..f088d71 100644 (file)
--- a/im_setting_selector/input_method_setting_selector_ui.cpp
+++ b/im_setting_selector/input_method_setting_selector_ui.cpp
@@ -67,8 +67,8 @@ im_setting_selector_main_window_create(const char *name, int app_type)
         elm_win_conformant_set(eo, EINA_TRUE);
         elm_win_autodel_set(eo, EINA_TRUE);
         elm_win_screen_size_get(eo, NULL, NULL, &w, &h);
-        if(w == -1 || h == -1){
-           LOGD("elm_win_screen_size_get() is failed\n");
+        if (w == -1 || h == -1) {
+           LOGW("elm_win_screen_size_get() is failed\n");
            return NULL;
         }
         evas_object_resize(eo, w, h);
@@ -103,16 +103,16 @@ static void im_setting_selector_load_ime_info(void)
     isf_control_get_active_ime(&active_ime_appid);
     ime_info_s *info = NULL;
     int cnt = isf_control_get_all_ime_info(&info);
-    if(info)
+    if (info)
     {
         for(int i=0; i<cnt; ++i)
         {
             SECURE_LOGD("%s %s %d %d %d", info[i].appid, info[i].label, info[i].is_enabled, info[i].is_preinstalled, info[i].has_option);
-            if(info[i].is_enabled && info[i].is_preinstalled)
+            if (info[i].is_enabled && info[i].is_preinstalled)
             {
                 ime_info_list_preinstall.push_back(info[i]);
             }
-            else if(info[i].is_enabled)
+            else if (info[i].is_enabled)
             {
                 ime_info_list_user.push_back(info[i]);
             }
@@ -123,13 +123,13 @@ static void im_setting_selector_load_ime_info(void)
     im_setting_selector_sort_ime_info(ime_info_list_preinstall, ime_info_list_user);
     for(unsigned int i=0; i<g_ime_info_list.size(); ++i)
     {
-        if(active_ime_appid && (!strcmp(active_ime_appid, g_ime_info_list[i].appid)))
+        if (active_ime_appid && (!strcmp(active_ime_appid, g_ime_info_list[i].appid)))
         {
             g_active_ime_id = i;
         }
     }
 
-    if(active_ime_appid)
+    if (active_ime_appid)
     {
         free(active_ime_appid);
     }
@@ -188,7 +188,7 @@ static void im_setting_selector_update_radio_state(Elm_Object_Item *item, Evas_O
         elm_genlist_item_selected_set (item, EINA_FALSE);
         /* Update check button */
         Evas_Object *radio = elm_object_item_part_content_get (item, "elm.icon.right");
-        if (radio == NULL){
+        if (radio == NULL) {
             radio = elm_object_item_part_content_get (item, "elm.icon");
         }
         evas_object_data_set (radio, "parent_genlist", obj);
@@ -208,7 +208,7 @@ static void im_setting_selector_ime_sel_cb(void *data, Evas_Object *obj, void *e
         return;
     im_setting_selector_update_radio_state(item, obj, index);
 
-    if(ad->caller){
+    if (ad->caller) {
         app_control_h reply;
         app_control_create(&reply);
         app_control_reply_to_launch_request(reply, ad->caller, APP_CONTROL_RESULT_SUCCEEDED);
@@ -242,7 +242,7 @@ static char *im_setting_selector_genlist_item_label_get(void *data, Evas_Object
 static Evas_Object *im_setting_selector_genlist_item_icon_get(void *data, Evas_Object *obj, const char *part)
 {
     int index = (int)reinterpret_cast<long>(data);
-    if (!strcmp(part, "elm.swallow.icon")){
+    if (!strcmp(part, "elm.swallow.icon")) {
         Evas_Object *bx = elm_box_add(obj);
         Evas_Object *radio = elm_radio_add(obj);
         elm_object_style_set (radio, "list");
@@ -266,7 +266,7 @@ static Evas_Object *im_setting_selector_genlist_item_icon_get(void *data, Evas_O
 static void im_setting_selector_genlist_item_class_create(void)
 {
     itc_im_selector = elm_genlist_item_class_new();
-    if (itc_im_selector){
+    if (itc_im_selector) {
         itc_im_selector->item_style = "double_label";
         itc_im_selector->func.text_get = im_setting_selector_genlist_item_label_get;
         itc_im_selector->func.content_get = im_setting_selector_genlist_item_icon_get;
@@ -337,7 +337,7 @@ im_setting_selector_popup_block_clicked_cb(void *data EINA_UNUSED, Evas_Object *
 Evas_Object *im_setting_selector_popup_create(void *data)
 {
     appdata *ad = (appdata *)data;
-    if(NULL == group_radio)
+    if (NULL == group_radio)
     {
         group_radio = elm_radio_add(ad->win);
         elm_radio_state_value_set(group_radio, -1);
@@ -360,7 +360,7 @@ Evas_Object *im_setting_selector_popup_create(void *data)
                          NULL);
     elm_naviframe_item_pop_cb_set(nf_main_item, im_setting_list_navi_item_pop_cb, ad);
 
-    if(APP_TYPE_SETTING != ad->app_type){
+    if (APP_TYPE_NORMAL == ad->app_type) {
         Evas_Object *btn = elm_button_add(ad->popup);
         elm_object_text_set(btn, IM_SETTING_SELECT_KEYBOARD);
         elm_object_part_content_set(ad->popup, "button1", btn);
@@ -395,7 +395,7 @@ im_setting_selector_app_pause(void *data)
 void im_setting_selector_app_terminate(void *data)
 {
     g_ime_info_list.clear();
-    if(NULL != itc_im_selector)
+    if (NULL != itc_im_selector)
     {
         elm_genlist_item_class_free(itc_im_selector);
         itc_im_selector = NULL;