[TSAM-8835/9061] Fixed some issues
[apps/native/ug-mobile-ap.git] / src / mh_view_wifi_setup.c
old mode 100644 (file)
new mode 100755 (executable)
index a2a3a28..f766110
@@ -7,7 +7,7 @@
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 
-* http://floralicense.org/license/
+* http://www.tizenopensource.org/license
 
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * limitations under the License.
 *
 */
+#include <efl_extension.h>
 
+#include "mh_popup.h"
 #include "mh_view_wifi_setup.h"
+#include "mh_string.h"
 
-static void __back_btn_cb(void *data, Evas_Object *obj, void *event_info);
 static void __gl_realized(void *data, Evas_Object *obj, void *event_info);
+static void __cancel_btn_cb(void *data, Evas_Object *object, void *event_info);
+static void __save_btn_cb(void *data, Evas_Object *object, void *event_info);
 
-static void __input_panel_event_cb(void *data, Ecore_IMF_Context *ctx, int value)
+static void __hide_btn_changed_cb(void *data, Evas_Object *obj, void *event_info)
 {
-       if (data == NULL) {
-               ERR("data is NULL\n");
-               return;
-       }
-
-       mh_wifi_setting_view_t *st = (mh_wifi_setting_view_t *)data;
+       __MOBILE_AP_FUNC_ENTER__;
 
-       if (st->navi_it == NULL) {
-               DBG("naviframe item is not pushed yet\n");
+       if (data == NULL || obj == NULL) {
+               ERR("Invalid param\n");
                return;
        }
 
-       if (value == ECORE_IMF_INPUT_PANEL_STATE_SHOW) {
-               DBG("value == ECORE_IMF_INPUT_PANEL_STATE_SHOW\n");
-               elm_object_item_signal_emit(st->navi_it, "elm,state,sip,shown", "");
-       } else if(value == ECORE_IMF_INPUT_PANEL_STATE_HIDE) {
-               DBG("value == ECORE_IMF_INPUT_PANEL_STATE_HIDE\n");
-               elm_object_item_signal_emit(st->navi_it, "elm,state,sip,hidden", "");
-       }
+       mh_appdata_t *ad = (mh_appdata_t *)data;
 
-       return;
+       ad->setup.visibility_new = !ad->setup.visibility_new;
+
+       __MOBILE_AP_FUNC_EXIT__;
 }
 
-static void __hide_btn_changed_cb(void *data, Evas_Object *obj, void *event_info)
+static bool __save_hide_btn_change(mh_appdata_t *ad)
 {
        __MOBILE_AP_FUNC_ENTER__;
 
-       if (data == NULL || obj == NULL) {
+       if (ad == NULL) {
                ERR("Invalid param\n");
-               return;
+               return false;
        }
 
-       mh_appdata_t *ad = (mh_appdata_t *)data;
        int ret = 0;
 
        ret = tethering_wifi_set_ssid_visibility(ad->handle,
-                       !ad->setup.visibility);
+                       ad->setup.visibility_new);
        if (ret != TETHERING_ERROR_NONE) {
                ERR("tethering_wifi_set_ssid_visibility is failed : %d\n", ret);
-               return;
+               return false;
        }
 
-       ad->setup.visibility = !ad->setup.visibility;
-
        __MOBILE_AP_FUNC_EXIT__;
+       return true;
 }
 
 static void __security_btn_changed_cb(void *data, Evas_Object *obj, void *event_info)
@@ -81,61 +74,89 @@ static void __security_btn_changed_cb(void *data, Evas_Object *obj, void *event_
        }
 
        mh_appdata_t *ad = (mh_appdata_t *)data;
-       int ret = 0;
+       mh_wifi_setting_view_t *st = &ad->setup;
 
-       if (ad->setup.security_type == TETHERING_WIFI_SECURITY_TYPE_NONE)
-               ad->setup.security_type = TETHERING_WIFI_SECURITY_TYPE_WPA2_PSK;
+       if (st->security_type_new == TETHERING_WIFI_SECURITY_TYPE_NONE)
+               st->security_type_new = TETHERING_WIFI_SECURITY_TYPE_WPA2_PSK;
        else
-               ad->setup.security_type = TETHERING_WIFI_SECURITY_TYPE_NONE;
+               st->security_type_new = TETHERING_WIFI_SECURITY_TYPE_NONE;
 
-       ret = tethering_wifi_set_security_type(ad->handle, ad->setup.security_type);
-       if (ret != TETHERING_ERROR_NONE) {
-               ERR("tethering_wifi_set_security_type is failed : %d\n", ret);
-               return;
+       /* update wifi passphrase item */
+       if (st->security_type_new == TETHERING_WIFI_SECURITY_TYPE_NONE) {
+               elm_object_item_disabled_set(st->pw_item, EINA_TRUE);
+               elm_object_disabled_set(st->save_button, EINA_FALSE);
+       } else {
+               elm_object_item_disabled_set(st->pw_item, EINA_FALSE);
        }
 
-       elm_genlist_item_update(ad->setup.pw_item);
+       if (st->pw_item)
+               elm_genlist_item_update(st->pw_item);
 
        __MOBILE_AP_FUNC_EXIT__;
 }
 
-static char *__gl_hide_label_get(void *data, Evas_Object *obj, const char *part)
+static bool __save_security_btn_change(mh_appdata_t *ad)
 {
        __MOBILE_AP_FUNC_ENTER__;
 
-       if (data == NULL || obj == NULL || part == NULL) {
+       if (ad == NULL) {
                ERR("Invalid param\n");
-               return NULL;
+               return false;
        }
 
-       if (strcmp(part, "elm.text") != 0) {
-               ERR("Invalid param\n");
-               return NULL;
+       int ret = 0;
+
+       ret = tethering_wifi_set_security_type(ad->handle, ad->setup.security_type_new);
+       if (ret != TETHERING_ERROR_NONE) {
+               ERR("tethering_wifi_set_security_type is failed : %d\n", ret);
+               return false;
        }
 
        __MOBILE_AP_FUNC_EXIT__;
-       return strdup(_("IDS_MOBILEAP_BODY_HIDE_MY_DEVICE"));
+       return true;
 }
 
-static char *__gl_security_label_get(void *data, Evas_Object *obj, const char *part)
+static char *__gl_device_name_title_label_get(void *data, Evas_Object *obj, const char *part)
 {
        __MOBILE_AP_FUNC_ENTER__;
+       mh_appdata_t *ad = (mh_appdata_t *)data;
+       char *device_name_utf = NULL;
+       char *ptr = NULL;
+       char buf[MH_LABEL_LENGTH_MAX] = {0, };
 
        if (data == NULL || obj == NULL || part == NULL) {
                ERR("Invalid param\n");
                return NULL;
        }
 
-       if (strcmp(part, "elm.text") != 0) {
-               ERR("Invalid param\n");
-               return NULL;
+       if (!strcmp("elm.text.multiline", part)) {
+               device_name_utf = vconf_get_str(VCONFKEY_SETAPPL_DEVICE_NAME_STR);
+               if (device_name_utf == NULL)
+                       ERR("vconf_get_str failed \n");
+
+               ptr = elm_entry_utf8_to_markup(device_name_utf);
+               if (ptr == NULL) {
+                       ERR("elm_entry_utf8_to_markup is failed\n");
+                       free(device_name_utf);
+                       return NULL;
+               }
+
+               g_strlcpy(ad->setup.device_name, ptr,
+                               sizeof(ad->setup.device_name));
+
+               snprintf(buf, MH_LABEL_LENGTH_MAX, "<font_size=30>%s</font_size><br>%s", STR_MY_DEVICE_NAME, ptr);
+
+               free(device_name_utf);
+               free(ptr);
+
+               return strdup(buf);
        }
 
        __MOBILE_AP_FUNC_EXIT__;
-       return strdup(_("IDS_MOBILEAP_BODY_SECURITY"));
+       return NULL;
 }
 
-static char *__gl_name_label_get(void *data, Evas_Object *obj, const char *part)
+static char *__gl_hide_label_get(void *data, Evas_Object *obj, const char *part)
 {
        __MOBILE_AP_FUNC_ENTER__;
 
@@ -144,40 +165,27 @@ static char *__gl_name_label_get(void *data, Evas_Object *obj, const char *part)
                return NULL;
        }
 
-       if (strcmp(part, "elm.text") != 0) {
-               ERR("Invalid param : %s\n", part);
-               return NULL;
-       }
+       if (!strcmp("elm.text", part))
+               return strdup(STR_HIDE_MY_DEV);
 
-       mh_appdata_t *ad = (mh_appdata_t *)data;
-       char label[MH_LABEL_LENGTH_MAX] = {0, };
-       char name_change_label[MH_LABEL_LENGTH_MAX] = {0, };
-       char path[MH_LABEL_LENGTH_MAX] = {0, };
-       char *device_name = NULL;
+       __MOBILE_AP_FUNC_EXIT__;
+       return NULL;
+}
 
-       DBG("Device name : %s\n", ad->setup.device_name);
+static char *__gl_security_label_get(void *data, Evas_Object *obj, const char *part)
+{
+       __MOBILE_AP_FUNC_ENTER__;
 
-       device_name = elm_entry_utf8_to_markup(ad->setup.device_name);
-       if (device_name == NULL) {
-               ERR("elm_entry_utf8_to_markup is failed\n");
+       if (data == NULL || obj == NULL || part == NULL) {
+               ERR("Invalid param\n");
                return NULL;
        }
 
-       snprintf(path, sizeof(path), "%s > %s",
-                       S_("IDS_COM_BODY_SETTINGS"),
-                       _("IDS_ST_BODY_ABOUT_PHONE"));
-       snprintf(name_change_label, sizeof(name_change_label),
-                       _("IDS_MOBILEAP_BODY_DEVICE_NAME_CAN_BE_CHANGED_IN_PS"),
-                       path);
-       snprintf(label, sizeof(label), "%s: %s<br>%s",
-                       _("IDS_MOBILEAP_BODY_DEVICE_NAME"),
-                       device_name,
-                       name_change_label);
-       free(device_name);
+       if (!strcmp("elm.text", part))
+               return strdup(STR_SECURITY_TYPE);
 
        __MOBILE_AP_FUNC_EXIT__;
-
-       return strdup(label);
+       return NULL;
 }
 
 static Evas_Object *__gl_hide_icon_get(void *data, Evas_Object *obj,
@@ -185,33 +193,31 @@ static Evas_Object *__gl_hide_icon_get(void *data, Evas_Object *obj,
 {
        __MOBILE_AP_FUNC_ENTER__;
 
-       if (data == NULL || obj == NULL || part == NULL) {
-               ERR("Invalid param\n");
-               return NULL;
-       }
+       mh_appdata_t *ad = (mh_appdata_t *)data;
+       Evas_Object *btn = NULL;
 
-       if (strcmp(part, "elm.icon") != 0) {
+       if (data == NULL || obj == NULL || part == NULL) {
                ERR("Invalid param\n");
                return NULL;
        }
 
-       mh_appdata_t *ad = (mh_appdata_t *)data;
-       Evas_Object *btn = NULL;
+       if (!strcmp("elm.swallow.end", part)) {
+               btn = elm_check_add(obj);
+               if (btn == NULL) {
+                       ERR("btn is NULL\n");
+                       return NULL;
+               }
 
-       btn = elm_check_add(obj);
-       if (btn == NULL) {
-               ERR("btn is NULL\n");
-               return NULL;
+               elm_object_style_set(btn, "on&off");
+               evas_object_show(btn);
+               evas_object_pass_events_set(btn, EINA_TRUE);
+               evas_object_propagate_events_set(btn, EINA_FALSE);
+               elm_object_focus_allow_set(btn, EINA_FALSE);
+               elm_check_state_set(btn, ad->setup.visibility_new ? EINA_FALSE : EINA_TRUE);
+               evas_object_smart_callback_add(btn, "changed",
+                               __hide_btn_changed_cb, (void *)ad);
+               ad->setup.hide_btn = btn;
        }
-       elm_object_style_set(btn, "on&off");
-       evas_object_show(btn);
-       evas_object_pass_events_set(btn, EINA_TRUE);
-       evas_object_propagate_events_set(btn, EINA_FALSE);
-       elm_check_state_set(btn, ad->setup.visibility ? EINA_FALSE : EINA_TRUE);
-       evas_object_smart_callback_add(btn, "changed",
-                       __hide_btn_changed_cb, (void *)ad);
-
-       ad->setup.hide_btn = btn;
 
        __MOBILE_AP_FUNC_EXIT__;
        return btn;
@@ -222,44 +228,39 @@ static Evas_Object *__gl_security_icon_get(void *data, Evas_Object *obj,
 {
        __MOBILE_AP_FUNC_ENTER__;
 
+       mh_appdata_t *ad = (mh_appdata_t *)data;
+       Evas_Object *btn = NULL;
+
        if (data == NULL || obj == NULL || part == NULL) {
                ERR("Invalid param\n");
                return NULL;
        }
 
-       if (strcmp(part, "elm.icon") != 0) {
-               ERR("Invalid param\n");
-               return NULL;
+       if (!strcmp("elm.swallow.end", part)) {
+               btn = elm_check_add(obj);
+               elm_object_style_set(btn, "on&off");
+               evas_object_show(btn);
+               evas_object_pass_events_set(btn, EINA_TRUE);
+               evas_object_propagate_events_set(btn, EINA_FALSE);
+               elm_check_state_set(btn, ad->setup.security_type_new ==
+                               TETHERING_WIFI_SECURITY_TYPE_NONE ?
+                               EINA_FALSE : EINA_TRUE);
+               evas_object_smart_callback_add(btn, "changed",
+                               __security_btn_changed_cb, (void *)ad);
+               ad->setup.security_btn = btn;
        }
 
-       mh_appdata_t *ad = (mh_appdata_t *)data;
-       Evas_Object *btn = NULL;
-
-       btn = elm_check_add(obj);
-
-       elm_object_style_set(btn, "on&off");
-       evas_object_show(btn);
-       evas_object_pass_events_set(btn, EINA_TRUE);
-       evas_object_propagate_events_set(btn, EINA_FALSE);
-       elm_check_state_set(btn, ad->setup.security_type ==
-                       TETHERING_WIFI_SECURITY_TYPE_NONE ?
-                       EINA_FALSE : EINA_TRUE);
-       evas_object_smart_callback_add(btn, "changed",
-                       __security_btn_changed_cb, (void *)ad);
-
-       ad->setup.security_btn = btn;
-
        __MOBILE_AP_FUNC_EXIT__;
        return btn;
 }
 
-static Eina_Bool __save_wifi_passphrase(mh_appdata_t *ad)
+static bool __save_wifi_passphrase(mh_appdata_t *ad)
 {
        __MOBILE_AP_FUNC_ENTER__;
 
        if (ad == NULL) {
                ERR("Invalid param\n");
-               return EINA_FALSE;
+               return false;
        }
 
        mh_wifi_setting_view_t *st = &ad->setup;
@@ -268,311 +269,307 @@ static Eina_Bool __save_wifi_passphrase(mh_appdata_t *ad)
        ret = tethering_wifi_set_passphrase(ad->handle, st->wifi_passphrase_new);
        if (ret != TETHERING_ERROR_NONE) {
                ERR("tethering_wifi_set_passphrase is failed : %d\n", ret);
-               return EINA_FALSE;
+               return false;
        }
 
-       DBG("SUCCESS : setting up VCONFKEY_MOBILE_HOTSPOT_WIFI_KEY\n");
-       g_strlcpy(st->wifi_passphrase, st->wifi_passphrase_new, sizeof(st->wifi_passphrase));
-
        __MOBILE_AP_FUNC_EXIT__;
-
-       return EINA_TRUE;
-}
-
-static void __passphrase_maxlength_reached_cb(void *data, Evas_Object *obj,
-               void *event_info)
-{
-       __MOBILE_AP_FUNC_ENTER__;
-
-       if (data == NULL || obj == NULL) {
-               ERR("The param is NULL\n");
-               return;
-       }
-
-       mh_appdata_t *ad = (mh_appdata_t *)data;
-       char buf[MH_LABEL_LENGTH_MAX] = {0, };
-
-       if (ad->popup != NULL) {
-               ERR("Popup already exists\n");
-               return;
-       }
-
-       elm_object_focus_set(ad->setup.pw_entry, EINA_FALSE);
-
-       if (__save_wifi_passphrase(ad) == EINA_FALSE) {
-               ERR("__save_wifi_passphrase is failed\n");
-               return;
-       }
-
-       snprintf(buf, sizeof(buf),
-                       _("IDS_MOBILEAP_POP_PASSWORD_MUST_CONTAIN_AT_LEAST_PD_CHARACTERS_AND_NOT_EXCEED_PD_CHARACTERS"),
-                       WIFI_PASSPHRASE_LENGTH_MIN, WIFI_PASSPHRASE_LENGTH_MAX);
-
-       _prepare_popup(ad, MH_POP_INFORMATION_WO_BUTTON, buf);
-       _create_popup(ad);
-
-       __MOBILE_AP_FUNC_EXIT__;
-}
-
-static void __passphrase_activated_cb(void *data, Evas_Object *obj,
-               void *event_info)
-{
-       __MOBILE_AP_FUNC_ENTER__;
-
-       if (data == NULL || obj == NULL) {
-               ERR("Invalid param\n");
-               return;
-       }
-
-       mh_appdata_t *ad = (mh_appdata_t *)data;
-
-       elm_object_focus_set(ad->setup.pw_entry, EINA_FALSE);
-
-       if (__save_wifi_passphrase(ad) == EINA_FALSE) {
-               ERR("__save_wifi_passphrase is failed\n");
-               return;
-       }
-
-       __MOBILE_AP_FUNC_EXIT__;
-
-       return;
+       return true;
 }
 
 static void __pw_entry_changed_cb(void *data, Evas_Object *obj,
-               void *event_info)
+                               void *event_info)
 {
        __MOBILE_AP_FUNC_ENTER__;
 
-       if (data == NULL || obj == NULL) {
-               ERR("Invalid param\n");
-               return;
-       }
-
        mh_appdata_t *ad = (mh_appdata_t *)data;
        mh_wifi_setting_view_t *st = &ad->setup;
        const char *changed_text;
        char *utf8_string;
+       int len = 0;
 
-       changed_text = elm_entry_entry_get(st->pw_entry);
+       changed_text = elm_entry_entry_get(obj);
        if (changed_text == NULL) {
                ERR("elm_entry_entry_get is failed\n");
                return;
        }
 
        utf8_string = elm_entry_markup_to_utf8(changed_text);
+
        if (utf8_string == NULL) {
                ERR("elm_entry_markup_to_utf8() Failed!!!\n");
        } else {
+               len = strlen(utf8_string);
+               if (WIFI_PASSPHRASE_LENGTH_MIN <= len) {
+                       elm_object_disabled_set(st->save_button, EINA_FALSE);
+                       elm_entry_input_panel_return_key_disabled_set(obj, FALSE);
+               } else {
+                       elm_object_disabled_set(st->save_button, EINA_TRUE);
+                       elm_entry_input_panel_return_key_disabled_set(obj, TRUE);
+               }
                g_strlcpy(st->wifi_passphrase_new, utf8_string,
-                               sizeof(st->wifi_passphrase_new));
+                                               sizeof(st->wifi_passphrase_new));
                free(utf8_string);
+               utf8_string = NULL;
        }
 
-       if (!elm_object_focus_get(st->pw_layout)) {
-               return;
-       }
-
-       if (elm_entry_is_empty(st->pw_entry)) {
-               elm_object_signal_emit(st->pw_layout,
-                               "elm,state,eraser,hide", "elm");
-       } else {
-               elm_object_signal_emit(st->pw_layout,
-                               "elm,state,eraser,show", "elm");
+       if (elm_object_part_content_get(obj, "elm.swallow.clear")) {
+               if (elm_object_focus_get(obj)) {
+                       if (elm_entry_is_empty(obj))
+                               elm_object_signal_emit(obj, "elm,state,clear,hidden", "");
+                       else
+                               elm_object_signal_emit(obj, "elm,state,clear,visible", "");
+               }
        }
 
        __MOBILE_AP_FUNC_EXIT__;
-
        return;
-
 }
 
-static void __pw_entry_focused_cb(void *data, Evas_Object *obj,
+static void __pw_entry_maxlength_reached_cb(void *data, Evas_Object *obj,
                void *event_info)
 {
        __MOBILE_AP_FUNC_ENTER__;
 
-       if (data == NULL || obj == NULL) {
-               ERR("Invalid param\n");
+       if (obj == NULL) {
+               ERR("The param is NULL\n");
+               __MOBILE_AP_FUNC_EXIT__;
                return;
        }
+       char buf[MH_LABEL_LENGTH_MAX] = { 0, };
+       char *fmt = STR_PASSWORD_MIN_MAX;
+       notification_error_e ret;
 
-       mh_appdata_t *ad = (mh_appdata_t *)data;
-       mh_wifi_setting_view_t *st = &ad->setup;
-
-       elm_entry_cursor_end_set(st->pw_entry);
-
-       if (!elm_entry_is_empty(st->pw_entry))
-               elm_object_signal_emit(st->pw_layout,
-                               "elm,state,eraser,show", "elm");
+       snprintf(buf, sizeof(buf), fmt,
+                       WIFI_PASSPHRASE_LENGTH_MIN, WIFI_PASSPHRASE_LENGTH_MAX);
 
-       elm_object_signal_emit(st->pw_layout,
-                       "elm,state,guidetext,hide", "elm");
+       ret = notification_status_message_post(buf);
+       if (ret != NOTIFICATION_ERROR_NONE)
+               ERR("notification_status_message_post() is failed : %d\n", ret);
 
        __MOBILE_AP_FUNC_EXIT__;
-
-       return;
-
 }
 
-static void __pw_entry_unfocused_cb(void *data, Evas_Object *obj,
-               void *event_info)
+static void __pw_entry_activated_cb(void *data, Evas_Object *obj, void *event_info)
 {
        __MOBILE_AP_FUNC_ENTER__;
 
-       if (data == NULL || obj == NULL) {
-               ERR("Invalid param\n");
+       if (obj == NULL) {
+               ERR("Invalid parameter");
                return;
        }
 
-       mh_appdata_t *ad = (mh_appdata_t *)data;
-       mh_wifi_setting_view_t *st = &ad->setup;
+       elm_object_focus_set(obj, EINA_FALSE);
+       __MOBILE_AP_FUNC_EXIT__;
+       return;
+}
 
-       if (elm_entry_is_empty(st->pw_entry))
-               elm_object_signal_emit(st->pw_layout,
-                               "elm,state,guidetext,show", "elm");
+static void __pw_entry_focused_cb(void *data, Evas_Object *obj, void *event_info)
+{
+       __MOBILE_AP_FUNC_ENTER__;
+       evas_object_smart_callback_del(obj, "focused", __pw_entry_focused_cb);
 
-       elm_object_signal_emit(st->pw_layout,
-                       "elm,state,eraser,hide", "elm");
+        elm_object_focus_set(obj, EINA_TRUE);
+        elm_entry_cursor_end_set(obj);
+        __MOBILE_AP_FUNC_EXIT__;
+}
 
+static void __pw_entry_unfocused_cb(void *data, Evas_Object *obj, void *event_info)
+{
+       __MOBILE_AP_FUNC_ENTER__;
+       if (elm_object_part_content_get(obj, "elm.swallow.clear"))
+               elm_object_signal_emit(obj, "elm,state,clear,hidden", "");
+       elm_object_signal_emit(obj, "elm,state,focus,off", "");
        __MOBILE_AP_FUNC_EXIT__;
+}
 
-       return;
+static void __pw_entry_show_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
+{
+       __MOBILE_AP_FUNC_ENTER__;
+        evas_object_event_callback_del(obj, EVAS_CALLBACK_SHOW, __pw_entry_show_cb);
 
+        elm_object_focus_set(obj, EINA_TRUE);
+        elm_entry_cursor_end_set(obj);
+        __MOBILE_AP_FUNC_EXIT__;
 }
 
-static void __pw_layout_eraser_clicked_cb(void *data, Evas_Object *obj,
-               const char *emission, const char *source)
+static void __eraser_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info)
 {
        __MOBILE_AP_FUNC_ENTER__;
 
-       if (data == NULL || obj == NULL) {
-               ERR("Invalid param\n");
+       elm_object_text_set(data, "");
+       elm_entry_input_panel_return_key_disabled_set(data, TRUE);
+
+       __MOBILE_AP_FUNC_EXIT__;
+}
+
+static void __pw_entry_language_changed_cb(void *data, Evas_Object *obj, void *event_info)
+{
+       __MOBILE_AP_FUNC_ENTER__;
+
+       if (obj == NULL || data == NULL) {
+               ERR("NULL param\n");
                return;
        }
-
        mh_appdata_t *ad = (mh_appdata_t *)data;
        mh_wifi_setting_view_t *st = &ad->setup;
+       char buf[MH_LABEL_LENGTH_MAX];
+       char *fmt = STR_PW_GUIDE_TEXT;
 
-       elm_entry_entry_set(st->pw_entry, "");
+       snprintf(buf, sizeof(buf), fmt, WIFI_PASSPHRASE_LENGTH_MIN);
 
+       if (st->security_type_new == TETHERING_WIFI_SECURITY_TYPE_NONE) {
+               if (st->pw_item)
+                       elm_genlist_item_update(st->pw_item);
+       } else {
+               elm_object_part_text_set(obj, "elm.guide", buf);
+       }
        __MOBILE_AP_FUNC_EXIT__;
-
-       return;
-
 }
 
-static Evas_Object *__gl_pw_icon_get(void *data, Evas_Object *obj,
-               const char *part)
+static Evas_Object *__get_pw_entry(void *data, Evas_Object *parent)
 {
        __MOBILE_AP_FUNC_ENTER__;
 
-       if (data == NULL || obj == NULL || part == NULL) {
-               ERR("Invalid param\n");
-               return NULL;
-       }
+       static Elm_Entry_Filter_Limit_Size limit_filter_data;
+       Evas_Object *entry = NULL;
+       char *fmt = STR_PW_GUIDE_TEXT;
+       char *ptr = NULL;
+       Evas_Object * clr_btn = NULL;
+       char buf[MH_LABEL_LENGTH_MAX];
 
-       if (strcmp(part, "elm.icon") != 0) {
-               ERR("Invalid part : %s\n", part);
+       if (parent == NULL || data == NULL) {
+               ERR("null param \n");
                return NULL;
        }
 
-       static Elm_Entry_Filter_Limit_Size limit_filter_data;
-
        mh_appdata_t *ad = (mh_appdata_t *)data;
        mh_wifi_setting_view_t *st = &ad->setup;
-       Evas_Object *entry = NULL;
-       char *ptr = NULL;
-       Ecore_IMF_Context *imf_context;
 
-       st->pw_layout = elm_layout_add(obj);
-       if (st->pw_layout == NULL) {
-               ERR("elm_layout_add returns NULL\n");
-               return NULL;
-       }
-       elm_layout_theme_set(st->pw_layout, "layout", "editfield", "title");
-       evas_object_size_hint_weight_set(st->pw_layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+       entry = elm_entry_add(parent);
 
-       entry = elm_entry_add(st->pw_layout);
        if (entry == NULL) {
                ERR("elm_entry_add returns NULL\n");
-               evas_object_del(st->pw_layout);
-               st->pw_layout = NULL;
+               st->pw_entry = NULL;
                return NULL;
        }
-       st->pw_entry = entry;
 
-       /* Set single line of entry */
-       elm_entry_scrollable_set(entry, EINA_TRUE);
        elm_entry_single_line_set(entry, EINA_TRUE);
+       elm_entry_scrollable_set(entry, EINA_TRUE);
+       elm_entry_password_set(entry, EINA_FALSE);
+
+       evas_object_smart_callback_add(entry, "language,changed",
+                       __pw_entry_language_changed_cb, ad);
+
+       eext_entry_selection_back_event_allow_set(entry, EINA_TRUE);
+       elm_entry_prediction_allow_set(entry, EINA_FALSE);
+       elm_object_signal_emit(entry, "elm,action,hide,search_icon", "");
        elm_entry_input_panel_layout_set(entry, ELM_INPUT_PANEL_LAYOUT_PASSWORD);
+       snprintf(buf, sizeof(buf), fmt, WIFI_PASSPHRASE_LENGTH_MIN);
+       elm_object_part_text_set(entry, "guide", buf);
+       elm_entry_cnp_mode_set(entry, ELM_CNP_MODE_PLAINTEXT);
 
-       /* Set the maximum length filter for passphrase entry */
        limit_filter_data.max_char_count = 0;
        limit_filter_data.max_byte_count = WIFI_PASSPHRASE_LENGTH_MAX;
-       elm_entry_markup_filter_append(entry,
-                       elm_entry_filter_limit_size, &limit_filter_data);
-
-       DBG("security_type : %d\n", st->security_type);
-       if (st->security_type == TETHERING_WIFI_SECURITY_TYPE_NONE) {
-               ptr = elm_entry_utf8_to_markup(st->wifi_passphrase);
-               if (ptr != NULL) {
-                       elm_entry_entry_set(entry, ptr);
-                       free(ptr);
-               } else {
-                       ERR("elm_entry_utf8_to_markup is failed\n");
-               }
+       elm_entry_markup_filter_append(entry, elm_entry_filter_limit_size, &limit_filter_data);
 
-               /* Set editable mode */
+       if (st->security_type_new == TETHERING_WIFI_SECURITY_TYPE_NONE) {
+               elm_object_part_text_set(entry, "default", buf);
                elm_entry_input_panel_enabled_set(entry, EINA_FALSE);
-               elm_entry_context_menu_disabled_set(entry, EINA_TRUE);
                elm_object_disabled_set(entry, EINA_TRUE);
+               if (st->pw_item)
+                       elm_object_item_signal_emit(st->pw_item, "elm,state,rename,hide", "");
+               return entry;
        } else {
+               elm_object_disabled_set(entry, EINA_FALSE);
+               elm_entry_input_panel_enabled_set(entry, EINA_TRUE);
                ptr = elm_entry_utf8_to_markup(st->wifi_passphrase_new);
                if (ptr != NULL) {
-                       elm_entry_entry_set(entry, ptr);
+                       elm_object_text_set(entry, ptr);
                        free(ptr);
                } else {
                        ERR("elm_entry_utf8_to_markup is failed\n");
                }
        }
 
+       elm_entry_input_panel_return_key_type_set(entry,
+                       ELM_INPUT_PANEL_RETURN_KEY_TYPE_DONE);
+
+       clr_btn = elm_button_add(entry);
+       elm_object_style_set(clr_btn, "search_clear");
+       elm_object_focus_allow_set(clr_btn, EINA_FALSE);
+       elm_object_part_content_set(entry, "elm.swallow.clear", clr_btn);
+       evas_object_smart_callback_add(clr_btn, "clicked", __eraser_btn_clicked_cb, entry);
+       evas_object_show(clr_btn);
+
+       evas_object_smart_callback_add(entry, "changed",
+                       __pw_entry_changed_cb, ad);
        evas_object_smart_callback_add(entry, "maxlength,reached",
-                       __passphrase_maxlength_reached_cb, data);
+                       __pw_entry_maxlength_reached_cb, ad);
        evas_object_smart_callback_add(entry, "activated",
-                       __passphrase_activated_cb, data);
-       evas_object_smart_callback_add(entry, "changed",
-                       __pw_entry_changed_cb, data);
+                       __pw_entry_activated_cb, NULL);
        evas_object_smart_callback_add(entry, "focused",
-                       __pw_entry_focused_cb, data);
+                       __pw_entry_focused_cb, NULL);
        evas_object_smart_callback_add(entry, "unfocused",
-                       __pw_entry_unfocused_cb, data);
+                       __pw_entry_unfocused_cb, NULL);
+       evas_object_event_callback_add(entry, EVAS_CALLBACK_SHOW,
+                       __pw_entry_show_cb, NULL);
+
+       elm_object_focus_set(entry, EINA_TRUE);
+       elm_entry_input_panel_show(entry);
+       elm_object_part_content_set(parent, "elm.swallow.content", entry);
+
+       st->pw_entry = entry;
 
-       imf_context = (Ecore_IMF_Context *)elm_entry_imf_context_get(entry);
-       if (imf_context)
-               ecore_imf_context_input_panel_event_callback_add(imf_context,
-                               ECORE_IMF_INPUT_PANEL_STATE_EVENT,
-                               __input_panel_event_cb, (void *)st);
+       __MOBILE_AP_FUNC_EXIT__;
+       return st->pw_entry;
+}
 
-       if (!elm_entry_is_empty(entry)) {
-               elm_object_signal_emit(st->pw_layout,
-                               "elm,state,guidetext,hide", "elm");
+static Evas_Object *__gl_pw_content_get(void *data, Evas_Object *obj, const char *part)
+{
+       __MOBILE_AP_FUNC_ENTER__;
+
+       int w = 720;
+       int h = 60;
+
+       if (data == NULL) {
+               ERR("data is null \n");
+               return NULL;
        }
 
-       elm_object_part_text_set(st->pw_layout, "elm.text",
-                       _("IDS_MOBILEAP_BODY_PASSWORD"));
-       elm_object_part_content_set(st->pw_layout, "elm.swallow.content", entry);
-       elm_object_part_text_set(st->pw_layout, "elm.guidetext",
-                       _("IDS_ST_BODY_ENTER_PASSWORD_OF_AT_LEAST_8_CHARACTERS"));
+       if (!strcmp(part, "elm.swallow.content")) {
+               Evas_Object *box = elm_box_add(obj);
+               Evas_Object *label = elm_label_add(box);
+               Evas_Object *layout = elm_layout_add(box);
+               char buf[MH_LABEL_LENGTH_MAX] = {0, };
 
-       elm_object_signal_callback_add(st->pw_layout, "elm,eraser,clicked", "elm",
-                       __pw_layout_eraser_clicked_cb, data);
+               elm_box_align_set(box, 0.0, 0.0);
 
-       evas_object_show(entry);
-       evas_object_show(st->pw_layout);
+               /* Set label for name field */
+               snprintf(buf, MH_LABEL_LENGTH_MAX, "<text align=left><font_size=30>%s</font_size></text>", STR_PASSWORD);
+               elm_object_text_set(label, buf);
+               evas_object_size_hint_align_set(label, EVAS_HINT_FILL, EVAS_HINT_FILL);
+               evas_object_size_hint_weight_set(label, 0.9, EVAS_HINT_EXPAND);
+               evas_object_size_hint_padding_set(label, ELM_SCALE_SIZE(10), ELM_SCALE_SIZE(10), 0, 0);
+               elm_box_pack_end(box, label);
+               evas_object_show(label);
 
-       __MOBILE_AP_FUNC_EXIT__;
+               /* Set layout for entry field */
+               elm_layout_theme_set(layout, "layout", "editfield", "singleline");
+               evas_object_size_hint_align_set(layout, EVAS_HINT_FILL, EVAS_HINT_FILL);
+               evas_object_size_hint_weight_set(layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+
+               __get_pw_entry(data, layout);
+               evas_object_show(layout);
+               elm_box_pack_end(box, layout);
+
+               evas_object_size_hint_min_set(box, ELM_SCALE_SIZE(w), ELM_SCALE_SIZE(h));
+               evas_object_show(box);
+
+               return box;
+       }
 
-       return st->pw_layout;
+       __MOBILE_AP_FUNC_EXIT__;
+       return NULL;
 }
 
 static void __gl_hide_item_sel(void *data, Evas_Object *obj, void *event_info)
@@ -587,9 +584,9 @@ static void __gl_hide_item_sel(void *data, Evas_Object *obj, void *event_info)
        mh_appdata_t *ad = (mh_appdata_t *)data;
 
        elm_genlist_item_selected_set((Elm_Object_Item*)event_info, EINA_FALSE);
+       __hide_btn_changed_cb(ad, obj, NULL);
 
-       __hide_btn_changed_cb(data, obj, NULL);
-       elm_check_state_set(ad->setup.hide_btn, ad->setup.visibility ?
+       elm_check_state_set(ad->setup.hide_btn, ad->setup.visibility_new ?
                        EINA_FALSE : EINA_TRUE);
 
        __MOBILE_AP_FUNC_EXIT__;
@@ -607,74 +604,65 @@ static void __gl_security_item_sel(void *data, Evas_Object *obj, void *event_inf
        mh_appdata_t *ad = (mh_appdata_t *)data;
 
        elm_genlist_item_selected_set((Elm_Object_Item*)event_info, EINA_FALSE);
-
        __security_btn_changed_cb(data, obj, NULL);
-       elm_check_state_set(ad->setup.security_btn, ad->setup.security_type ==
+       elm_check_state_set(ad->setup.security_btn, ad->setup.security_type_new ==
                        TETHERING_WIFI_SECURITY_TYPE_NONE ? EINA_FALSE : EINA_TRUE);
 
        __MOBILE_AP_FUNC_EXIT__;
 }
 
-static void __free_genlist_itc(mh_appdata_t *ad)
-{
-       __MOBILE_AP_FUNC_ENTER__;
-
-       elm_genlist_item_class_free(ad->setup.sp_itc);
-       elm_genlist_item_class_free(ad->setup.hide_itc);
-       elm_genlist_item_class_free(ad->setup.security_itc);
-       elm_genlist_item_class_free(ad->setup.pw_itc);
-       elm_genlist_item_class_free(ad->setup.name_itc);
-
-       __MOBILE_AP_FUNC_EXIT__;
-       return;
-}
-
 static void __set_genlist_itc(mh_appdata_t *ad)
 {
        __MOBILE_AP_FUNC_ENTER__;
 
-       ad->setup.sp_itc = elm_genlist_item_class_new();
-       ad->setup.sp_itc->item_style = "dialogue/separator";
-       ad->setup.sp_itc->func.text_get = NULL;
-       ad->setup.sp_itc->func.content_get = NULL;
-       ad->setup.sp_itc->func.state_get = NULL;
-       ad->setup.sp_itc->func.del = NULL;
+       ad->setup.name_itc = elm_genlist_item_class_new();
+       if (ad->setup.name_itc == NULL) {
+               ERR("elm_genlist_item_class_new failed\n");
+               __MOBILE_AP_FUNC_EXIT__;
+               return;
+       }
+       ad->setup.name_itc->item_style = MH_GENLIST_MULTILINE_TEXT_STYLE;
+       ad->setup.name_itc->func.text_get = __gl_device_name_title_label_get;
+       ad->setup.name_itc->func.content_get = NULL;
+       ad->setup.name_itc->func.state_get = NULL;
+       ad->setup.name_itc->func.del = NULL;
 
        ad->setup.hide_itc = elm_genlist_item_class_new();
-       ad->setup.hide_itc->item_style = "dialogue/1text.1icon";
+       if (ad->setup.hide_itc == NULL) {
+               ERR("elm_genlist_item_class_new failed\n");
+               __MOBILE_AP_FUNC_EXIT__;
+               return;
+       }
+       ad->setup.hide_itc->item_style = MH_GENLIST_1LINE_TEXT_ICON_STYLE;
        ad->setup.hide_itc->func.text_get = __gl_hide_label_get;
        ad->setup.hide_itc->func.content_get = __gl_hide_icon_get;
        ad->setup.hide_itc->func.state_get = NULL;
        ad->setup.hide_itc->func.del = NULL;
 
        ad->setup.security_itc = elm_genlist_item_class_new();
-       ad->setup.security_itc->item_style = "dialogue/1text.1icon";
+       if (ad->setup.security_itc == NULL) {
+               ERR("elm_genlist_item_class_new failed\n");
+               __MOBILE_AP_FUNC_EXIT__;
+               return;
+       }
+       ad->setup.security_itc->item_style = MH_GENLIST_1LINE_TEXT_ICON_STYLE;
        ad->setup.security_itc->func.text_get = __gl_security_label_get;
        ad->setup.security_itc->func.content_get = __gl_security_icon_get;
        ad->setup.security_itc->func.state_get = NULL;
        ad->setup.security_itc->func.del = NULL;
 
        ad->setup.pw_itc = elm_genlist_item_class_new();
-       ad->setup.pw_itc->item_style = "dialogue/1icon";
+       if (ad->setup.pw_itc == NULL) {
+               ERR("elm_genlist_item_class_new failed\n");
+               __MOBILE_AP_FUNC_EXIT__;
+               return;
+       }
+       ad->setup.pw_itc->item_style = MH_GENLIST_FULL_CONTENT_STYLE;
        ad->setup.pw_itc->func.text_get = NULL;
-       ad->setup.pw_itc->func.content_get = __gl_pw_icon_get;
+       ad->setup.pw_itc->func.content_get = __gl_pw_content_get;
        ad->setup.pw_itc->func.state_get = NULL;
        ad->setup.pw_itc->func.del = NULL;
 
-       ad->setup.name_itc = elm_genlist_item_class_new();
-       ad->setup.name_itc->item_style = "multiline/1text";
-       ad->setup.name_itc->func.text_get = __gl_name_label_get;
-       ad->setup.name_itc->func.content_get = NULL;
-       ad->setup.name_itc->func.state_get = NULL;
-       ad->setup.name_itc->func.del = NULL;
-
-       ad->setup.end_sp_itc = elm_genlist_item_class_new();
-       ad->setup.end_sp_itc->item_style = "dialogue/separator";
-       ad->setup.end_sp_itc->func.text_get = NULL;
-       ad->setup.end_sp_itc->func.content_get = NULL;
-       ad->setup.end_sp_itc->func.state_get = NULL;
-       ad->setup.end_sp_itc->func.del = NULL;
-
        __MOBILE_AP_FUNC_EXIT__;
        return;
 }
@@ -688,112 +676,163 @@ static void __deconstruct_wifi_setup_view(mh_wifi_setting_view_t *st)
                return;
        }
 
-       if (st->pw_entry == NULL) {
-               ERR("pw_entry is NULL");
-               return;
-       }
-
        evas_object_smart_callback_del(st->hide_btn, "changed",
                        __hide_btn_changed_cb);
        evas_object_smart_callback_del(st->security_btn, "changed",
                        __security_btn_changed_cb);
-       if (st->pw_entry) {
-               evas_object_smart_callback_del(st->pw_entry,
-                               "maxlength,reached",
-                               __passphrase_maxlength_reached_cb);
-               evas_object_smart_callback_del(st->pw_entry,
-                               "activated",
-                               __passphrase_activated_cb);
-       }
-       evas_object_smart_callback_del(st->back_btn, "clicked",
-                       __back_btn_cb);
+       evas_object_smart_callback_del(st->cancel_button, "clicked",
+                       __cancel_btn_cb);
+       evas_object_smart_callback_del(st->save_button, "clicked",
+                       __save_btn_cb);
        evas_object_smart_callback_del(st->genlist, "realized",
                        __gl_realized);
 
-       st->hide_btn = NULL;
-       st->security_btn = NULL;
-       st->pw_layout = NULL;
-       st->pw_entry = NULL;
-       st->back_btn = NULL;
-       st->genlist = NULL;
-
        __MOBILE_AP_FUNC_EXIT__;
 }
 
-static void __back_btn_cb(void *data, Evas_Object *obj, void *event_info)
+static void __settings_reloaded_cb(tethering_error_e result, void *user_data)
 {
+       if (user_data == NULL) {
+               ERR("Invalid parameter\n");
+               return;
+       }
+
        __MOBILE_AP_FUNC_ENTER__;
 
+       mh_appdata_t *ad = (mh_appdata_t *)user_data;
+
+       if (result != TETHERING_ERROR_NONE)
+               ERR("tethering_wifi_reload_settings is failed [0x%X]\n", result);
+       _update_wifi_item(ad, MH_STATE_NONE);
+
+       __MOBILE_AP_FUNC_EXIT__;
+
+       return;
+}
+
+static void __save_btn_cb(void *data, Evas_Object *object, void *event_info)
+{
+       DBG("+\n");
        if (data == NULL) {
-               ERR("The param is NULL\n");
+               ERR("data is NULL\n");
                return;
        }
 
        mh_appdata_t *ad = (mh_appdata_t *)data;
        mh_wifi_setting_view_t *st = &ad->setup;
-       int ret;
-
-       elm_object_focus_set(st->pw_entry, EINA_FALSE);
-
-       if (strlen(st->wifi_passphrase_new) < WIFI_PASSPHRASE_LENGTH_MIN) {
-               DBG("Password is shorter than %d\n", WIFI_PASSPHRASE_LENGTH_MIN);
-               _prepare_popup(ad, MH_POP_WIFI_PASSWORD_SHORT,
-                               _("IDS_ST_BODY_ENTER_PASSWORD_OF_AT_LEAST_8_CHARACTERS"));
-               _create_popup(ad);
-               return;
+       bool ret = false;
+       bool is_setting_changed = false;
+
+       /* handle hide button change */
+       if (st->visibility != st->visibility_new) {
+               ret = __save_hide_btn_change(ad);
+               if (ret == false) {
+                       elm_check_state_set(st->hide_btn, st->visibility ?
+                                       EINA_FALSE : EINA_TRUE);
+               } else {
+                       st->visibility = st->visibility_new;
+                       is_setting_changed = true;
+               }
+       }
+       /* handle security button change */
+       if (st->security_type != st->security_type_new) {
+               ret = __save_security_btn_change(ad);
+               if (ret == false) {
+                       elm_check_state_set(st->security_btn, st->security_type ==
+                                       TETHERING_WIFI_SECURITY_TYPE_NONE ? EINA_FALSE : EINA_TRUE);
+               } else {
+                               st->security_type = st->security_type_new;
+                               is_setting_changed = true;
+               }
        }
 
-       if (g_strcmp0(st->wifi_passphrase, st->wifi_passphrase_new) != 0) {
-               if (__save_wifi_passphrase(ad) == EINA_FALSE) {
-                       ERR("__save_wifi_passphrase is failed\n");
+       /* handle wifi passphrase change */
+       if (strcmp(st->wifi_passphrase, st->wifi_passphrase_new)) {
+               ret = __save_wifi_passphrase(ad);
+               if (ret == false) {
+                       g_strlcpy(st->wifi_passphrase_new, st->wifi_passphrase,
+                                       sizeof(st->wifi_passphrase_new));
+                       if (st->pw_item)
+                               elm_genlist_item_update(st->pw_item);
+               } else {
+                       g_strlcpy(st->wifi_passphrase, st->wifi_passphrase_new,
+                                       sizeof(st->wifi_passphrase));
+                       is_setting_changed = true;
+                       if (ad->main.help_item) {
+                               if (ad->main.help_item)
+                                       elm_genlist_item_update(ad->main.help_item);
+                       }
                }
        }
 
-       if (ad->main.need_recover_wifi_tethering == true) {
-               DBG("Turn on Wi-Fi tethering again\n");
+       if (is_setting_changed) {
                _update_wifi_item(ad, MH_STATE_PROCESS);
+
                if (ad->main.help_item)
                        elm_genlist_item_update(ad->main.help_item);
 
-               ret = tethering_enable(ad->handle, TETHERING_TYPE_WIFI);
-               if (ret != TETHERING_ERROR_NONE) {
-                       ERR("Wi-Fi tethering on is failed : %d\n", ret);
-                       _update_wifi_item(ad, MH_STATE_NONE);
-                       ad->main.need_recover_wifi_tethering = false;
-               }
+               /* reload wifi settings */
+               ret = tethering_wifi_reload_settings(ad->handle, __settings_reloaded_cb,
+                               (void *)ad);
+               if (ret != TETHERING_ERROR_NONE)
+                       ERR("reload_configuration is failed : %d\n", ret);
        }
 
-       __deconstruct_wifi_setup_view(st);
-
-       evas_object_del(ad->setup.genlist);
-       __free_genlist_itc(ad);
-
        elm_naviframe_item_pop(ad->naviframe);
 
-       __MOBILE_AP_FUNC_EXIT__;
+       DBG("-\n");
+       return;
 }
 
-static void __title_back_btn_cb(void *data, Evas_Object *obj, void *event_info)
+static void __cancel_btn_cb(void *data, Evas_Object *object, void *event_info)
 {
-       __MOBILE_AP_FUNC_ENTER__;
+       DBG("+\n");
 
-       if (data == NULL || obj == NULL) {
-               ERR("Invalid param\n");
+       if (data == NULL) {
+               ERR("The param is NULL\n");
                return;
        }
 
        mh_appdata_t *ad = (mh_appdata_t *)data;
 
-       elm_object_focus_set(ad->setup.pw_entry, EINA_FALSE);
+       elm_naviframe_item_pop(ad->naviframe);
+       DBG("-\n");
+       return;
+}
 
-       if (__save_wifi_passphrase(ad) == EINA_FALSE) {
-               ERR("__save_wifi_passphrase is failed\n");
-               return;
+Eina_Bool _setting_back_btn_cb(void *data, Elm_Object_Item *navi_item)
+{
+       DBG("+\n");
+
+       if (data == NULL) {
+               ERR("The param is NULL\n");
+               return EINA_FALSE;
        }
 
-       __MOBILE_AP_FUNC_EXIT__;
+       mh_appdata_t *ad = (mh_appdata_t *)data;
+       mh_wifi_setting_view_t *st = &ad->setup;
 
-       return;
+       if (st->visibility != st->visibility_new)
+               st->visibility_new = st->visibility;
+
+       if (st->security_type != st->security_type_new)
+               st->security_type_new = st->security_type;
+
+       if (strcmp(st->wifi_passphrase_new, st->wifi_passphrase)) {
+               g_strlcpy(st->wifi_passphrase_new, st->wifi_passphrase,
+                                       sizeof(st->wifi_passphrase_new));
+       }
+       st->pw_entry = NULL;
+       __deconstruct_wifi_setup_view(st);
+
+       if (ad->rename_popup != NULL) {
+               evas_object_del(ad->rename_popup);
+               ad->rename_popup = NULL;
+       }
+       ad->setup.navi_it = NULL;
+
+       DBG("-\n");
+       return EINA_TRUE;
 }
 
 static void __gl_realized(void *data, Evas_Object *obj, void *event_info)
@@ -803,18 +842,38 @@ static void __gl_realized(void *data, Evas_Object *obj, void *event_info)
        mh_appdata_t *ad = (mh_appdata_t *)data;
        mh_wifi_setting_view_t *st = &(ad->setup);
        Elm_Object_Item *item = (Elm_Object_Item *)event_info;
+       Evas_Object *ao;
+       Evas_Object *btn;
+       char str[MH_LABEL_LENGTH_MAX] = {0, };
+       int no_of_sp;
+       int i;
 
-       if (item == st->hide_item) {
-               DBG("Hide item is realized\n");
+       if (item == st->hide_item)
                elm_object_item_signal_emit(item, "elm,state,top", "");
-       } else if (item == st->security_item) {
-               DBG("Security item is realized\n");
+       else if (item == st->security_item)
                elm_object_item_signal_emit(item, "elm,state,center", "");
-       } else if (item == st->pw_item) {
-               DBG("Password item is realized\n");
+       else if (item == st->pw_item)
                elm_object_item_signal_emit(item, "elm,state,bottom", "");
-       } else if (item == st->name_item) {
-               DBG("Name item is realized\n");
+
+       no_of_sp = sizeof(st->sp_item) / sizeof(st->sp_item[0]);
+       for (i = 0; i < no_of_sp; i++) {
+               if (item == st->sp_item[i])
+                       elm_object_item_access_unregister(item);
+       }
+
+       if (item == st->hide_item || item == st->security_item) {
+               ao = elm_object_item_access_object_get(item);
+               btn = elm_object_item_part_content_get(item, "on&off");
+               snprintf(str, sizeof(str), "%s, %s", "On/off button",
+                               (elm_check_state_get(btn) ? "On" : "Off"));
+               elm_access_info_set(ao, ELM_ACCESS_CONTEXT_INFO, str);
+       }
+
+       if (item == st->pw_item) {
+               elm_object_item_access_unregister(item);
+               ao = elm_object_item_access_register(item);
+               snprintf(str, sizeof(str), "%s, %s", STR_PASSWORD, st->wifi_passphrase_new);
+               elm_access_info_set(ao, ELM_ACCESS_CONTEXT_INFO, str);
        }
 
        __MOBILE_AP_FUNC_EXIT__;
@@ -822,6 +881,24 @@ static void __gl_realized(void *data, Evas_Object *obj, void *event_info)
        return;
 }
 
+static void __select_passphrase_item(void *data, Evas_Object *obj, void *event_info)
+{
+       __MOBILE_AP_FUNC_ENTER__;
+
+       if (data == NULL) {
+               ERR("The param is NULL\n");
+               return;
+       }
+
+       mh_appdata_t *ad = (mh_appdata_t *)data;
+       mh_wifi_setting_view_t *st = &ad->setup;
+
+       elm_object_focus_set(st->pw_entry, EINA_TRUE);
+
+       __MOBILE_AP_FUNC_EXIT__;
+       return;
+}
+
 Evas_Object *__create_genlist(mh_appdata_t *ad)
 {
        __MOBILE_AP_FUNC_ENTER__;
@@ -834,7 +911,6 @@ Evas_Object *__create_genlist(mh_appdata_t *ad)
        void *data = (void *)ad;
        mh_wifi_setting_view_t *st = &ad->setup;
        Evas_Object *genlist;
-       Elm_Object_Item *item;
 
        genlist = elm_genlist_add(ad->naviframe);
        if (genlist == NULL) {
@@ -847,9 +923,13 @@ Evas_Object *__create_genlist(mh_appdata_t *ad)
        evas_object_smart_callback_add(genlist, "realized", __gl_realized, ad);
 
        __set_genlist_itc(ad);
-       item = elm_genlist_item_append(genlist, st->sp_itc, NULL, NULL,
+
+       st->name_item = elm_genlist_item_append(genlist, st->name_itc, data, NULL,
                        ELM_GENLIST_ITEM_NONE, NULL, NULL);
-       elm_genlist_item_select_mode_set(item, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
+       elm_genlist_item_select_mode_set(st->name_item, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
+
+       if (st->name_item)
+               elm_object_item_disabled_set(st->name_item, EINA_TRUE);
 
        st->hide_item = elm_genlist_item_append(genlist, st->hide_itc, data, NULL,
                        ELM_GENLIST_ITEM_NONE, __gl_hide_item_sel, data);
@@ -858,17 +938,18 @@ Evas_Object *__create_genlist(mh_appdata_t *ad)
                        ELM_GENLIST_ITEM_NONE, __gl_security_item_sel, data);
 
        st->pw_item = elm_genlist_item_append(genlist, st->pw_itc, data, NULL,
-                       ELM_GENLIST_ITEM_NONE, NULL, NULL);
-       elm_genlist_item_select_mode_set(st->pw_item, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
-
-       st->name_item = elm_genlist_item_append(genlist, st->name_itc, data, NULL,
-                       ELM_GENLIST_ITEM_NONE, NULL, NULL);
-       elm_genlist_item_select_mode_set(st->name_item, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
+                       ELM_GENLIST_ITEM_NONE, __select_passphrase_item, ad);
+       if (st->security_type == TETHERING_WIFI_SECURITY_TYPE_NONE)
+               elm_object_item_disabled_set(st->pw_item, EINA_TRUE);
+       else
+               elm_object_item_disabled_set(st->pw_item, EINA_FALSE);
 
-       item = elm_genlist_item_append(genlist, st->end_sp_itc, NULL, NULL,
+/* End separator is removed because of P131104-03336. It is confirmed by UX team for this case.
+       item = elm_genlist_item_append(genlist, st->sp_itc, NULL, NULL,
                        ELM_GENLIST_ITEM_NONE, NULL, NULL);
        elm_genlist_item_select_mode_set(item, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
-
+       st->sp_item[i++] = item;
+*/
 
        __MOBILE_AP_FUNC_EXIT__;
 
@@ -877,54 +958,45 @@ Evas_Object *__create_genlist(mh_appdata_t *ad)
 
 void mh_draw_wifi_setup_view(mh_appdata_t *ad)
 {
-       __MOBILE_AP_FUNC_ENTER__;
+       DBG("+\n");
 
        if (ad == NULL) {
                ERR("ad is NULL\n");
+               DBG("-\n");
                return;
        }
-
+       Evas_Object *btn;
        mh_wifi_setting_view_t *st = &ad->setup;
 
-       if (st->genlist != NULL) {
+       if (ad->setup.navi_it != NULL) {
                ERR("Wi-Fi setup view already exists\n");
+               DBG("-\n");
                return;
        }
 
        st->genlist = __create_genlist(ad);
        if (st->genlist == NULL) {
                ERR("__create_genlist returns NULL\n");
-               goto FAIL;
-       }
-
-       st->back_btn = elm_button_add(ad->naviframe);
-       if (st->back_btn == NULL) {
-               ERR("elm_button_add returns NULL\n");
-               goto FAIL;
+               DBG("-\n");
+               return;
        }
-       elm_object_style_set(st->back_btn, "naviframe/back_btn/default");
-       evas_object_smart_callback_add(st->back_btn, "clicked",
-                       __back_btn_cb, ad);
-
-       st->navi_it = elm_naviframe_item_push(ad->naviframe,
-                       _("IDS_MOBILEAP_MBODY_WI_FI_TETHERING_SETTINGS"),
-                       st->back_btn, NULL, st->genlist, NULL);
 
-       st->title_back_btn = elm_button_add(ad->naviframe);
-       elm_object_style_set(st->title_back_btn, "naviframe/back_btn/default");
-       evas_object_smart_callback_add(st->title_back_btn, "clicked", __title_back_btn_cb, ad);
-       elm_object_item_part_content_set(st->navi_it, "title_prev_btn", st->title_back_btn);
+       st->navi_it = elm_naviframe_item_push(ad->naviframe, "IDS_MOBILEAP_MBODY_WI_FI_TETHERING",
+                       NULL, NULL, st->genlist, NULL);
+       elm_object_item_domain_text_translatable_set(st->navi_it, PKGNAME, EINA_TRUE);
 
-       __MOBILE_AP_FUNC_EXIT__;
-
-       return;
+       elm_naviframe_item_pop_cb_set(st->navi_it, _setting_back_btn_cb, (void *)ad);
 
-FAIL:
-       if (st->back_btn)
-               evas_object_del(st->back_btn);
-       if (st->genlist)
-               evas_object_del(st->genlist);
+       btn = elm_button_add(ad->naviframe);
+       elm_object_style_set(btn, "naviframe/title_cancel");
+       evas_object_smart_callback_add(btn, "clicked", __cancel_btn_cb, ad);
+       elm_object_item_part_content_set(st->navi_it, "title_left_btn", btn);
+       st->cancel_button = btn;
 
-       st->back_btn = NULL;
-       st->genlist = NULL;
+       btn = elm_button_add(ad->naviframe);
+       elm_object_style_set(btn, "naviframe/title_done");
+       evas_object_smart_callback_add(btn, "clicked", __save_btn_cb, ad);
+       elm_object_item_part_content_set(st->navi_it, "title_right_btn", btn);
+       st->save_button = btn;
+       DBG("-\n");
 }