Tizen souce update
authorKim Kibum <kb0929.kim@samsung.com>
Fri, 27 Apr 2012 04:26:05 +0000 (13:26 +0900)
committerKim Kibum <kb0929.kim@samsung.com>
Fri, 27 Apr 2012 04:26:05 +0000 (13:26 +0900)
28 files changed:
debian/changelog
org.tizen.setting.png
resource/Open_Source_Announcement.html
resource/Open_Source_Announcement.txt
setting-about/src/setting-about-main.c
setting-common/include/setting-common-resource.h
setting-common/src/setting-cfg.c
setting-common/src/setting-common-draw-widget.c [changed mode: 0644->0755]
setting-connectivity/include/setting-connectivity.h
setting-connectivity/src/setting-connectivity-usb.c
setting-display/src/setting-display.c
setting-memory/include/setting-memory-status.h
setting-phone/src/setting-phone-region-format.c [changed mode: 0644->0755]
setting-profile/src/setting-profile-sound-main.c
setting-reset/src/setting-reset-main.c
setting-time/src/setting-time-engine.c
setting-time/src/setting-time-main.c
src/po/de_DE.po
src/po/el_GR.po
src/po/en.po
src/po/es_ES.po
src/po/fr_FR.po
src/po/it_IT.po
src/po/ko_KR.po
src/po/nl_NL.po
src/po/pt_PT.po
src/po/ru_RU.po
src/po/tr_TR.po

index 09571f0..1b32194 100755 (executable)
@@ -1,3 +1,13 @@
+setting (0.1.87-76) unstable; urgency=low
+
+  * Modify SW version and mode
+  * Remove Security menu
+  * Fix that setting stops unexpectedly
+  * Git: pkgs/s/settings
+  * Tag: setting_0.1.87-76
+
+ -- Taeyoung Kim <ty317.kim@samsung.com>  Mon, 23 Apr 2012 21:03:11 +0900
+
 setting (0.1.87-75) unstable; urgency=low
 
   * Apply EFL migration
index b898e1d..5e893ee 100644 (file)
Binary files a/org.tizen.setting.png and b/org.tizen.setting.png differ
index 34b9dca..62c8561 100644 (file)
@@ -35,7 +35,7 @@ Packages: libpcre
 </p><p><b>License: perl License</b><br/>
 Packages: libperl5.10, perl, perl-base, perl-debug, perl-doc, perl-modules, perl-suid
 </p><p><b>License: GPLv2</b><br/>
-Packages: apt, bash, default-files-slp, login, mtd-utils, passwd, alsa-utils, base-files, base-passwd, bluez, busybox, busybox-symlinks-adduser, busybox-symlinks-adjtimex, busybox-symlinks-binutils, busybox-symlinks-bridge-utils, busybox-symlinks-bsdmainutils, busybox-symlinks-busybox, busybox-symlinks-bzip2, busybox-symlinks-console-tools, busybox-symlinks-cpio, busybox-symlinks-cron, busybox-symlinks-daemontools, busybox-symlinks-dc, busybox-symlinks-dnsutils, busybox-symlinks-dosfstools, busybox-symlinks-ed, busybox-symlinks-eject, busybox-symlinks-fbset, busybox-symlinks-fdflush, busybox-symlinks-hdparm, busybox-symlinks-ifupdown, busybox-symlinks-initscripts, busybox-symlinks-ipcalc, busybox-symlinks-iproute, busybox-symlinks-ipsvd, busybox-symlinks-iputils-arping, busybox-symlinks-iputils-ping, busybox-symlinks-klogd, busybox-symlinks-loadlin, busybox-symlinks-lrzsz, busybox-symlinks-lzma, busybox-symlinks-lzop, busybox-symlinks-module-init-tools, busybox-symlinks-mtd-utils, busybox-symlinks-net-tools, busybox-symlinks-openbsd-inetd, busybox-symlinks-passwd, busybox-symlinks-patch, busybox-symlinks-ppp, busybox-symlinks-procps, busybox-symlinks-psmisc, busybox-symlinks-rdate, busybox-symlinks-realpath, busybox-symlinks-rpm, busybox-symlinks-runit, busybox-symlinks-sharutils, busybox-symlinks-ssmtp, busybox-symlinks-sysklogd, busybox-symlinks-telnetd, busybox-symlinks-tftp, busybox-symlinks-time, busybox-symlinks-tofrodos, busybox-symlinks-udhcpc, busybox-symlinks-udhcpd, busybox-symlinks-unzip, busybox-symlinks-vlan, busybox-symlinks-vlock, busybox-symlinks-watchdog, busybox-symlinks-wget, busybox-symlinks-xterm, busybox-symlinks-zcip, connman, e2fsck-static, execstack, gnupg, gpgv, ifupdown, initscripts, insserv, iptables, lib64readline5, libbluetooth3, libc-bin, libc-dev-bin, libc6, libc6-i686, libc6-prof, libelfg0, libfuse-dev, libgstreamer-plugins-base0.10-0, libgudev-1.0-0, liblzo2-2, libpci3, libreadline5, libudev0, linux-base, linux-headers-2.6.36-trunk-all, linux-headers-2.6.36-trunk-all-armel, linux-headers-2.6.36-trunk-common, linux-headers-2.6.36-trunk-u1, linux-image-2.6.36-trunk-u1, linux-kbuild-2.6.36, linux-source-2.6.36, locales, lsb-base, ltrace, mawk, module-init-tools, netbase, obexd, oprofile, pciutils, pkg-config, prelink, procps, psmisc, ragel, readline-common, rlfe, locales-init, shared-mime-info, simulator-opengl-dev, smackutils, system-plugin-slp, sysv-rc, sysvinit, sysvinit-utils, u-boot, u-boot-tools, udev, usbutils, valgrind, tzdata-slp, fakeroot
+Packages: apt, bash, default-files-slp, login, mtd-utils, passwd, alsa-utils, base-files, base-passwd, bluez, busybox, busybox-symlinks-adduser, busybox-symlinks-adjtimex, busybox-symlinks-binutils, busybox-symlinks-bridge-utils, busybox-symlinks-bsdmainutils, busybox-symlinks-busybox, busybox-symlinks-bzip2, busybox-symlinks-console-tools, busybox-symlinks-cpio, busybox-symlinks-cron, busybox-symlinks-daemontools, busybox-symlinks-dc, busybox-symlinks-dnsutils, busybox-symlinks-dosfstools, busybox-symlinks-ed, busybox-symlinks-eject, busybox-symlinks-fbset, busybox-symlinks-fdflush, busybox-symlinks-hdparm, busybox-symlinks-ifupdown, busybox-symlinks-initscripts, busybox-symlinks-ipcalc, busybox-symlinks-iproute, busybox-symlinks-ipsvd, busybox-symlinks-iputils-arping, busybox-symlinks-iputils-ping, busybox-symlinks-klogd, busybox-symlinks-loadlin, busybox-symlinks-lrzsz, busybox-symlinks-lzma, busybox-symlinks-lzop, busybox-symlinks-module-init-tools, busybox-symlinks-mtd-utils, busybox-symlinks-net-tools, busybox-symlinks-openbsd-inetd, busybox-symlinks-passwd, busybox-symlinks-patch, busybox-symlinks-ppp, busybox-symlinks-procps, busybox-symlinks-psmisc, busybox-symlinks-rdate, busybox-symlinks-realpath, busybox-symlinks-rpm, busybox-symlinks-runit, busybox-symlinks-sharutils, busybox-symlinks-ssmtp, busybox-symlinks-sysklogd, busybox-symlinks-telnetd, busybox-symlinks-tftp, busybox-symlinks-time, busybox-symlinks-tofrodos, busybox-symlinks-udhcpc, busybox-symlinks-udhcpd, busybox-symlinks-unzip, busybox-symlinks-vlan, busybox-symlinks-vlock, busybox-symlinks-watchdog, busybox-symlinks-wget, busybox-symlinks-xterm, busybox-symlinks-zcip, connman, e2fsck-static, execstack, gnupg, gpgv, ifupdown, initscripts, insserv, iptables, lib64readline5, libbluetooth3, libc-bin, libc-dev-bin, libc6, libc6-i686, libc6-prof, libelfg0, libfuse-dev, libgstreamer-plugins-base0.10-0, libgudev-1.0-0, liblzo2-2, libpci3, libreadline5, libudev0, linux-base, linux-headers-2.6.36-trunk-all, linux-headers-2.6.36-trunk-all-armel, linux-headers-2.6.36-trunk-common, linux-headers-2.6.36-trunk-u1, linux-image-2.6.36-trunk-u1, linux-kbuild-2.6.36, linux-source-2.6.36, locales, lsb-base, ltrace, mawk, module-init-tools, netbase, obexd, oprofile, pciutils, pkg-config, prelink, procps, psmisc, ragel, readline-common, rlfe, locales-init, shared-mime-info, simulator-opengl-dev, smackutils, system-plugin-slp, sysv-rc, sysvinit, sysvinit-utils, u-boot, u-boot-tools, udev, usbutils, valgrind, tzdata-slp, fakeroot, dpkg
 </p><p><b>License: GPLv2, LGPLv2.1</b><br/>
 Packages: attr, acl, libacl1, libattr1
 </p><p><b>License: GPLv3</b><br/>
index b993514..b1a7c99 100755 (executable)
@@ -41,7 +41,7 @@ License: perl License
 Packages: libperl5.10, perl, perl-base, perl-debug, perl-doc, perl-modules, perl-suid\r
 \r
 License: GPLv2\r
-Packages: apt, bash, default-files-slp, login, mtd-utils, passwd, alsa-utils, base-files, base-passwd, bluez, busybox, busybox-symlinks-adduser, busybox-symlinks-adjtimex, busybox-symlinks-binutils, busybox-symlinks-bridge-utils, busybox-symlinks-bsdmainutils, busybox-symlinks-busybox, busybox-symlinks-bzip2, busybox-symlinks-console-tools, busybox-symlinks-cpio, busybox-symlinks-cron, busybox-symlinks-daemontools, busybox-symlinks-dc, busybox-symlinks-dnsutils, busybox-symlinks-dosfstools, busybox-symlinks-ed, busybox-symlinks-eject, busybox-symlinks-fbset, busybox-symlinks-fdflush, busybox-symlinks-hdparm, busybox-symlinks-ifupdown, busybox-symlinks-initscripts, busybox-symlinks-ipcalc, busybox-symlinks-iproute, busybox-symlinks-ipsvd, busybox-symlinks-iputils-arping, busybox-symlinks-iputils-ping, busybox-symlinks-klogd, busybox-symlinks-loadlin, busybox-symlinks-lrzsz, busybox-symlinks-lzma, busybox-symlinks-lzop, busybox-symlinks-module-init-tools, busybox-symlinks-mtd-utils, busybox-symlinks-net-tools, busybox-symlinks-openbsd-inetd, busybox-symlinks-passwd, busybox-symlinks-patch, busybox-symlinks-ppp, busybox-symlinks-procps, busybox-symlinks-psmisc, busybox-symlinks-rdate, busybox-symlinks-realpath, busybox-symlinks-rpm, busybox-symlinks-runit, busybox-symlinks-sharutils, busybox-symlinks-ssmtp, busybox-symlinks-sysklogd, busybox-symlinks-telnetd, busybox-symlinks-tftp, busybox-symlinks-time, busybox-symlinks-tofrodos, busybox-symlinks-udhcpc, busybox-symlinks-udhcpd, busybox-symlinks-unzip, busybox-symlinks-vlan, busybox-symlinks-vlock, busybox-symlinks-watchdog, busybox-symlinks-wget, busybox-symlinks-xterm, busybox-symlinks-zcip, connman, e2fsck-static, execstack, gnupg, gpgv, ifupdown, initscripts, insserv, iptables, lib64readline5, libbluetooth3, libc-bin, libc-dev-bin, libc6, libc6-i686, libc6-prof, libelfg0, libfuse-dev, libgstreamer-plugins-base0.10-0, libgudev-1.0-0, liblzo2-2, libpci3, libreadline5, libudev0, linux-base, linux-headers-2.6.36-trunk-all, linux-headers-2.6.36-trunk-all-armel, linux-headers-2.6.36-trunk-common, linux-headers-2.6.36-trunk-u1, linux-image-2.6.36-trunk-u1, linux-kbuild-2.6.36, linux-source-2.6.36, locales, lsb-base, ltrace, mawk, module-init-tools, netbase, obexd, oprofile, pciutils, pkg-config, prelink, procps, psmisc, ragel, readline-common, rlfe, locales-init, shared-mime-info, simulator-opengl-dev, smackutils, system-plugin-slp, sysv-rc, sysvinit, sysvinit-utils, u-boot, u-boot-tools, udev, usbutils, valgrind, tzdata-slp, fakeroot\r
+Packages: apt, bash, default-files-slp, login, mtd-utils, passwd, alsa-utils, base-files, base-passwd, bluez, busybox, busybox-symlinks-adduser, busybox-symlinks-adjtimex, busybox-symlinks-binutils, busybox-symlinks-bridge-utils, busybox-symlinks-bsdmainutils, busybox-symlinks-busybox, busybox-symlinks-bzip2, busybox-symlinks-console-tools, busybox-symlinks-cpio, busybox-symlinks-cron, busybox-symlinks-daemontools, busybox-symlinks-dc, busybox-symlinks-dnsutils, busybox-symlinks-dosfstools, busybox-symlinks-ed, busybox-symlinks-eject, busybox-symlinks-fbset, busybox-symlinks-fdflush, busybox-symlinks-hdparm, busybox-symlinks-ifupdown, busybox-symlinks-initscripts, busybox-symlinks-ipcalc, busybox-symlinks-iproute, busybox-symlinks-ipsvd, busybox-symlinks-iputils-arping, busybox-symlinks-iputils-ping, busybox-symlinks-klogd, busybox-symlinks-loadlin, busybox-symlinks-lrzsz, busybox-symlinks-lzma, busybox-symlinks-lzop, busybox-symlinks-module-init-tools, busybox-symlinks-mtd-utils, busybox-symlinks-net-tools, busybox-symlinks-openbsd-inetd, busybox-symlinks-passwd, busybox-symlinks-patch, busybox-symlinks-ppp, busybox-symlinks-procps, busybox-symlinks-psmisc, busybox-symlinks-rdate, busybox-symlinks-realpath, busybox-symlinks-rpm, busybox-symlinks-runit, busybox-symlinks-sharutils, busybox-symlinks-ssmtp, busybox-symlinks-sysklogd, busybox-symlinks-telnetd, busybox-symlinks-tftp, busybox-symlinks-time, busybox-symlinks-tofrodos, busybox-symlinks-udhcpc, busybox-symlinks-udhcpd, busybox-symlinks-unzip, busybox-symlinks-vlan, busybox-symlinks-vlock, busybox-symlinks-watchdog, busybox-symlinks-wget, busybox-symlinks-xterm, busybox-symlinks-zcip, connman, e2fsck-static, execstack, gnupg, gpgv, ifupdown, initscripts, insserv, iptables, lib64readline5, libbluetooth3, libc-bin, libc-dev-bin, libc6, libc6-i686, libc6-prof, libelfg0, libfuse-dev, libgstreamer-plugins-base0.10-0, libgudev-1.0-0, liblzo2-2, libpci3, libreadline5, libudev0, linux-base, linux-headers-2.6.36-trunk-all, linux-headers-2.6.36-trunk-all-armel, linux-headers-2.6.36-trunk-common, linux-headers-2.6.36-trunk-u1, linux-image-2.6.36-trunk-u1, linux-kbuild-2.6.36, linux-source-2.6.36, locales, lsb-base, ltrace, mawk, module-init-tools, netbase, obexd, oprofile, pciutils, pkg-config, prelink, procps, psmisc, ragel, readline-common, rlfe, locales-init, shared-mime-info, simulator-opengl-dev, smackutils, system-plugin-slp, sysv-rc, sysvinit, sysvinit-utils, u-boot, u-boot-tools, udev, usbutils, valgrind, tzdata-slp, fakeroot, dpkg\r
 \r
 License: GPLv2, LGPLv2.1\r
 Packages: attr, acl, libacl1, libattr1\r
index 577cdb9..52416eb 100755 (executable)
@@ -167,7 +167,7 @@ void setting_about_main_get_phone_model_name(char* szStr, int nSize)
                snprintf(szStr, nSize, "%s", "SDK");
        } else {
                if (!strncmp(szBin, "TIZEN", 5)) {
-                       snprintf(szStr, nSize, "TIZEN");
+                       snprintf(szStr, nSize, "TIZEN REFERENCE");
                } else {
                        snprintf(szStr, nSize, "%s", _("IDS_ST_HEADER_UNAVAILABLE"));
                }
@@ -188,7 +188,7 @@ void setting_about_main_get_sw_version(char* szStr, int nSize)
                snprintf(szStr, nSize, "%s", _("IDS_ST_HEADER_UNAVAILABLE"));
        } else {
                char* szBinVer =
-                       g_strdup((char*)iniparser_getstr(dic, "Version:Build"));
+                       g_strdup((char*)iniparser_getstr(dic, "Version:Version"));
                if (szBinVer) {
                        char* pPos = szBinVer;
                        while(*pPos++) {
@@ -197,8 +197,19 @@ void setting_about_main_get_sw_version(char* szStr, int nSize)
                } else {
                        szBinVer = g_strdup(_("IDS_ST_HEADER_UNAVAILABLE"));
                }
-               snprintf(szStr, nSize, "TIZEN (%s)", szBinVer);
-               G_FREE(szBinVer);
+               char* szBinVerMaj = g_strdup((char*)iniparser_getstr(dic, "Version:Major"));
+               char* szBinVerMin = g_strdup((char*)iniparser_getstr(dic, "Version:Minor"));
+
+               if (szBinVerMaj == NULL || szBinVerMaj == '\0'
+                                       || szBinVerMin == NULL || szBinVerMin == '\0') {
+                       snprintf(szStr, nSize, "TIZEN %s", szBinVer);
+               } else {
+                       snprintf(szStr, nSize, "TIZEN%s.%s %s", szBinVerMaj, szBinVerMin, szBinVer);
+               }
+
+               if (szBinVer != NULL) G_FREE(szBinVer);
+               if (szBinVerMaj != NULL) G_FREE(szBinVerMaj);
+               if (szBinVerMin != NULL) G_FREE(szBinVerMin);
        }
 
        if (dic) {
@@ -487,6 +498,39 @@ static void __entry_unfocus_cb(void *data, Evas_Object *obj, void *event_info)
 
 }
 
+static void __entry_key_down_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
+{
+       ret_if(data == NULL);
+       SettingAboutUG *ad = (SettingAboutUG*)data;
+       Evas_Event_Key_Down *ev = (Evas_Event_Key_Down *)event_info;
+       SETTING_TRACE_DEBUG("ev->key : %s", ev->key);
+
+       if(safeStrCmp(ev->key, "Return") == 0)
+       {
+               // if entry has 1 char at list, hide ime.
+               if(safeStrLen(elm_entry_entry_get(obj)) > 0)
+               {
+                       ecore_imf_context_input_panel_hide((Ecore_IMF_Context*)elm_entry_imf_context_get(obj));
+               }
+               else
+               {
+                       setting_create_popup_without_btn(ad, ad->win_get,_(EMPTY_LIMITATION_STR),
+                                    NULL, NULL, POPUP_INTERVAL);
+               }
+       }
+}
+
+static Eina_Bool __add_event_on_idler(void *data)
+{
+       retv_if(data==NULL, FALSE);
+
+       SettingAboutUG *ad = (SettingAboutUG*)data;
+
+       if(ad->item_dev_name)
+       evas_object_event_callback_add(ad->item_dev_name->eo_check, EVAS_CALLBACK_KEY_DOWN, __entry_key_down_cb, ad);
+
+       return ECORE_CALLBACK_CANCEL;
+}
 
 static int setting_about_main_create(void *cb)
 {
@@ -701,6 +745,8 @@ static int setting_about_main_create(void *cb)
        ad->update_timer =
            ecore_timer_add(2, (Ecore_Task_Cb) __timer_update_cb, ad);
 
+       ecore_idler_add(__add_event_on_idler, ad);
+
        setting_view_about_main.is_create = 1;
 
        return SETTING_RETURN_SUCCESS;
index 73e7600..55bb36a 100755 (executable)
 /* applications keyStr*/
 #define KeyStr_DownloadedAPPs          "IDS_ST_BODY_DOWNLOADED_APPLICATIONS"
 #define KeyStr_AppsInformation         "IDS_ST_BODY_APPLICATION_INFO"
-#define KeyStr_ManageApps              "Manage applications"
+#define KeyStr_ManageApps              "IDS_ST_BODY_MANAGE_APPLICATIONS"
 #define KeyStr_NewExchange             "New exchange"
 
 #define KeyStr_MoreConnect             "More connectivity settings"
index 2296135..a77d68d 100755 (executable)
@@ -151,6 +151,7 @@ int setting_cfg_create(void)
        __create_a_menu(KeyStr_Applications);
 
        __create_an_item_by_pkg(KeyStr_Call, "org.tizen.phone", "setting-call-efl", Cfg_Item_Pos_Level0, Cfg_Item_unResetable);
+       __create_an_item_by_pkg(KeyStr_Messages, "org.tizen.message", "msg-setting-efl", Cfg_Item_Pos_Level0, Cfg_Item_unResetable);
        __create_an_item_by_pkg(KeyStr_Contacts, "org.tizen.contacts", "contacts-settings-efl|request_type:71", Cfg_Item_Pos_Level1, Cfg_Item_unResetable);
 
        __create_an_item_by_pkg(KeyStr_Calendar, "org.tizen.efl-calendar", "calendar-settings-efl", Cfg_Item_Pos_Level1, Cfg_Item_unResetable);
old mode 100644 (file)
new mode 100755 (executable)
index a55724e..2f7700e
@@ -3301,7 +3301,9 @@ int setting_searchbar_redraw(void *data,
 {
        SETTING_TRACE_BEGIN;
        setting_retvm_if(search_bar == NULL, -1, "search_bar parameter is NULL");
-       const char *str = elm_object_text_get(search_bar);
+       //const char *str = elm_object_text_get(search_bar);
+       Evas_Object *entry = elm_object_part_content_get(search_bar, "elm.swallow.content");
+       const char *str = elm_entry_entry_get(entry);
        int str_len = safeStrLen(str);
        setting_retvm_if(str_len > MAX_SEARCH_STR_LEN, -1, "str_len > MAX_SEARCH_STR_LEN");
 
@@ -3319,24 +3321,76 @@ int setting_searchbar_redraw(void *data,
        return 0;
 }
 
-/**
-* Searchbar cancel click cb.
-*
-* @param[in] data
-* @param[in] obj
-* @param[in] event_info
-*/
-static void __searchbar_cancel_clicked_cb(void *data, Evas_Object *obj, void *event_info)
+static void __searchbar_chg_cb(void *data, Evas_Object *obj, void *event_info)
 {
-       SETTING_TRACE_BEGIN;
-       setting_retm_if(data == NULL, "Data parameter is NULL");
-       Evas_Object *searchbar = (Evas_Object *)data;
+       Evas_Object *searchbar_layout = data;
+       if (elm_object_focus_get(searchbar_layout)) {
+               if (elm_entry_is_empty(obj)) {
+                       elm_object_signal_emit(searchbar_layout, "elm,state,eraser,hide", "elm");
+               }
+               else
+                       elm_object_signal_emit(searchbar_layout, "elm,state,eraser,show", "elm");
+       }
+}
+
+static void __searchbar_focused_cb(void *data, Evas_Object *obj, void *event_info)
+{
+       ret_if(!data || !obj);
+       Evas_Object *searchbar_layout = data;
+       if (!elm_entry_is_empty(obj))
+               elm_object_signal_emit(searchbar_layout, "elm,state,eraser,show", "elm");
+       elm_object_signal_emit(searchbar_layout, "elm,state,guidetext,hide", "elm");
+       elm_object_signal_emit(searchbar_layout, "cancel,in", "");
+}
+
+static void __searchbar_unfocused_cb(void *data, Evas_Object *obj, void *event_info)
+{
+       ret_if(!data || !obj);
+       Evas_Object *searchbar_layout = data;
+       if (elm_entry_is_empty(obj))
+               elm_object_signal_emit(searchbar_layout, "elm,state,guidetext,show", "elm");
+       elm_object_signal_emit(searchbar_layout, "elm,state,eraser,hide", "elm");
+}
+
+static void __searchbar_eraser_clicked_cb(void *data, Evas_Object *obj, const char *emission, const char *source)
+{
+       ret_if(!data);
+       Evas_Object *entry = data;
+       elm_entry_entry_set(entry, "");
+}
+
+static void __searchbar_bg_clicked_cb(void *data, Evas_Object *obj, const char *emission, const char *source)
+{
+       ret_if(!data);
+       Evas_Object *entry = data;
+       elm_object_focus_set(entry, EINA_TRUE);
+}
 
-       Evas_Object *en = elm_object_part_content_get(searchbar, "elm.swallow.content");
-       Ecore_IMF_Context *imf_context = (Ecore_IMF_Context *)elm_entry_imf_context_get(en);
+static void __searchbar_cancel_clicked_cb(void *data, Evas_Object *obj, void *event_info)
+{
+       ret_if(!data || !obj);
+       evas_object_hide(obj);
+       Evas_Object *searchbar_layout = data;
+       elm_object_signal_emit(searchbar_layout, "cancel,out", "");
+       Evas_Object *entry = elm_object_part_content_get(searchbar_layout, "elm.swallow.content");
+       ret_if(!entry);
+       const char* text = elm_entry_entry_get(entry);
+       if (text != NULL && strlen(text) > 0)
+               elm_entry_entry_set(entry, NULL);
+       elm_object_focus_set(entry, EINA_FALSE);
+       #if 0
+       Ecore_IMF_Context *imf_context = (Ecore_IMF_Context*)elm_entry_imf_context_get(entry);
        if (imf_context) {
                ecore_imf_context_input_panel_hide(imf_context);
        }
+       #endif
+}
+
+static void __searchbar_searchsymbol_clicked_cb(void *data, Evas_Object *obj, const char *emission, const char *source)
+{
+       ret_if(!data);
+       Evas_Object *entry = data;
+       elm_object_focus_set(entry, EINA_TRUE);
 }
 
 /**
@@ -3353,25 +3407,36 @@ Evas_Object *setting_create_searchbar(void *data, Evas_Object *parent,
 {
        SETTING_TRACE_BEGIN;
        setting_retvm_if(parent == NULL, NULL, "parent parameter is NULL");
-       Evas_Object *search_bar = edje_object_part_external_object_get(_EDJ(parent), "searchbar");
-
-       Evas_Object *en = elm_object_part_content_get(search_bar, "elm.swallow.content");
-       elm_entry_input_panel_layout_set(en, ELM_INPUT_PANEL_LAYOUT_NORMAL);
-
-       elm_object_part_text_set(search_bar, "elm.guidetext", _("IDS_COM_SK_SEARCH"));
-
-       if (change_cb) {
-               evas_object_smart_callback_add(en, "delay-changed", change_cb, data);
-       }
-
+       Evas_Object *searchbar_layout = elm_layout_add(parent);
+       elm_layout_theme_set(searchbar_layout, "layout", "searchbar", "cancel_button");
+       elm_object_part_content_set(parent, "searchbar", searchbar_layout);
+       Evas_Object *entry = elm_entry_add(searchbar_layout);
+       elm_entry_scrollable_set(entry, EINA_TRUE);
+       elm_entry_single_line_set(entry, EINA_TRUE);
+       if (change_cb) evas_object_smart_callback_add(entry, "changed", change_cb, data);
+       evas_object_smart_callback_add(entry, "changed", __searchbar_chg_cb, searchbar_layout);
+       evas_object_smart_callback_add(entry, "focused", __searchbar_focused_cb, searchbar_layout);
+       evas_object_smart_callback_add(entry, "unfocused", __searchbar_unfocused_cb, searchbar_layout);
+       elm_entry_input_panel_layout_set(entry, ELM_INPUT_PANEL_LAYOUT_NORMAL);
+       elm_object_part_content_set(searchbar_layout, "elm.swallow.content", entry);
+       elm_object_part_text_set(searchbar_layout, "elm.guidetext", _("IDS_COM_SK_SEARCH"));
+       elm_object_signal_callback_add(searchbar_layout, "elm,eraser,clicked", "elm", __searchbar_eraser_clicked_cb, entry);
+       elm_object_signal_callback_add(searchbar_layout, "elm,bg,clicked", "elm", __searchbar_bg_clicked_cb, entry);
+       evas_object_size_hint_weight_set(searchbar_layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+       evas_object_size_hint_align_set(searchbar_layout, EVAS_HINT_FILL, EVAS_HINT_FILL);
+
+
+       Evas_Object *cancel_btn = elm_button_add(searchbar_layout);
+       elm_object_part_content_set(searchbar_layout, "button_cancel", cancel_btn);
+       elm_object_style_set(cancel_btn, "searchbar/default");
+       elm_object_text_set(cancel_btn, _("Cancel"));
+       
        if (!cancel_cb){
                cancel_cb = __searchbar_cancel_clicked_cb;
        }
-       evas_object_smart_callback_add(search_bar, "cancel,clicked",
-                                      cancel_cb, search_bar);
-
-       evas_object_show(search_bar);
-       return search_bar;
+       evas_object_smart_callback_add(cancel_btn, "clicked", cancel_cb, searchbar_layout);
+       elm_object_signal_callback_add(searchbar_layout, "elm,action,click", "", __searchbar_searchsymbol_clicked_cb, entry);
+       return searchbar_layout;
 }
 
 /**
index 67e78f0..7378647 100755 (executable)
@@ -82,6 +82,7 @@ struct _SettingConnectivityUG {
        Elm_Genlist_Item_Class itc_seperator;
        Elm_Genlist_Item_Class itc_help_style;
        int noti_fd;
+       int isUsbConnected;
 };
 
 extern setting_view setting_view_connectivity_usb;
index 60714b5..08dd9c6 100644 (file)
@@ -34,13 +34,13 @@ static int setting_connectivity_usb_cleanup(void *cb);
 static void mode_change_vconf_cb(keynode_t *key, void *data);
 static void set_progressbar_status (int mode);
 static void unset_progressbar_status (int mode);
-static void usb_chgdet_cb(void *data);
 static int disable_glitem(int index);
 static int enable_glitem(int index);
 static void enable_all_buttons();
 static int disable_all_buttons(int enable);
 static void unload_popup();
 void load_usb_connection_popup(Evas_Object *radio);
+static void usb_status_vconf_cb(keynode_t *key, void *data);
 
 /* set button style */
 static Elm_Genlist_Item_Class itc;
@@ -147,6 +147,16 @@ Evas_Object *_gl_icon_get(void *data, Evas_Object *obj, const char *part)
        return icon;
 }
 
+static void setting_connectivity_usb_radio_up_cb(void *data, Evas_Object *obj, void *event_info)
+{
+       SETTING_TRACE_BEGIN;
+       setting_retm_if(data == NULL, "ERROR: data == NULL");
+       Evas_Object *radio = (Evas_Object *)obj;
+       SETTING_TRACE("Radio set: when pushing cancel btn on popup\n");
+       elm_radio_value_set(radio, SETTING_USB_DEFAULT_MODE);
+       SETTING_TRACE_END;
+}
+
 /**
  * Do process when clicking on some genlist item
  */
@@ -304,7 +314,8 @@ static int setting_connectivity_usb_create(void *cb)
                                                           ad->chk_con,
                                                           SETTING_USB_DEFAULT_MODE,
                                                           title_default_usb_button,
-                                                          NULL, NULL, SETTING_USB_DEFAULT_MODE);
+                                                          setting_connectivity_usb_radio_up_cb,
+                                                          NULL, SETTING_USB_DEFAULT_MODE);
 
        SETTING_TRACE("First item of First group is set\n");
 
@@ -323,14 +334,15 @@ static int setting_connectivity_usb_create(void *cb)
                                                           ad->chk_con,
                                                           SETTING_USB_DEBUG_MODE,
                                                           _("IDS_ST_BODY_USB_DEBUGGING"),
-                                                          NULL, NULL, SETTING_USB_DEBUG_MODE);
+                                                          setting_connectivity_usb_radio_up_cb,
+                                                          NULL, SETTING_USB_DEBUG_MODE);
 
        SETTING_TRACE("First item of Second group is set\n");
 
-       jack_status = check_usb_jack_status();
+       ad->isUsbConnected = check_usb_jack_status();
 
        /* Set curMode and selMode which are internal variables */
-       if ( jack_status == USB_CONNECTED)
+       if ( ad->isUsbConnected == USB_CONNECTED)
        {
                setting_get_int_slp_key(INT_SLP_SETTING_USB_MODE, &curMode, &err);
                if (err != 0)
@@ -350,7 +362,7 @@ static int setting_connectivity_usb_create(void *cb)
        }
 
        /*  set state */
-       if (jack_status == USB_CONNECTED) {
+       if (ad->isUsbConnected == USB_CONNECTED) {
                SETTING_TRACE("Radio set: initial radio \n");
                elm_radio_value_set(ad->chk_con, curMode);
        }
@@ -367,28 +379,14 @@ static int setting_connectivity_usb_create(void *cb)
                return SETTING_RETURN_FAIL;
        }
 
-       /* This heynoti is for the noti of the USB connection status change */
-       ad->noti_fd = heynoti_init();
-       if (ad->noti_fd == -1)
+       /* Registering callback function for VCONFKEY_SETAPPL_USB_MODE_INT */
+       vconf_ret = vconf_notify_key_changed(VCONFKEY_SYSMAN_USB_STATUS, usb_status_vconf_cb, ad);
+       if(vconf_ret != 0)
        {
-               SETTING_TRACE("FAIL: heynoti_init()\n");
-               setting_connectivity_usb_destroy(ad);
+               SETTING_TRACE("FAIL: vconf_notify_key_changed(VCONFKEY_SYSMAN_USB_STATUS)\n");
                return SETTING_RETURN_FAIL;
        }
 
-       if (heynoti_subscribe(ad->noti_fd,"device_usb_chgdet", usb_chgdet_cb, ad) == -1)
-       {
-               SETTING_TRACE("FAIL: heynoti_subscribe()\n");
-               setting_connectivity_usb_destroy(ad);
-               return SETTING_RETURN_FAIL;
-       }
-       
-       if(heynoti_attach_handler(ad->noti_fd) == -1)
-       {
-               SETTING_TRACE("FAIL: heynoti_attach_handler()\n");
-               setting_connectivity_usb_destroy(ad);
-               return SETTING_RETURN_FAIL;
-       }
        SETTING_TRACE("curMode: %d, selMode: %d\n", curMode, selMode);
 
        setting_view_connectivity_usb.is_create = 1;
@@ -490,73 +488,80 @@ static void enable_all_buttons()
        SETTING_TRACE_END;
 }
 
-
-/**
- * This callback function is called when USB cable is connected or disconnected
- */
-static void usb_chgdet_cb(void *data)
+static void usb_status_vconf_cb(keynode_t *key, void *data)
 {
        SETTING_TRACE_BEGIN;
-       if(data == NULL)
-       {
-               SETTING_TRACE("ERROR:The parameter(data) is NULL\n");
-               return;
-       }
+       setting_retm_if(data == NULL, "ERROR:The parameter(data) is NULL\n");
        SettingConnectivityUG *ad = (SettingConnectivityUG *) data;
 
-       int val;
+       int val = -1;
        int ret = -1;
 
-       SETTING_TRACE("curMode: %d, selMode: %d\n", curMode, selMode);
-       if (device_get_property(DEVTYPE_JACK, JACK_PROP_USB_ONLINE, &val) == 0) 
-       {
-               if (val) 
-               {
-                       SETTING_TRACE("USB cable is connected\n");
+       ret = vconf_get_int(VCONFKEY_SYSMAN_USB_STATUS, &val);
+       setting_retm_if(ret != 0, "FAIL: vconf_get_int(VCONFKEY_SYSMAN_USB_STATUS)");
 
-                       if (IN_CHANGE == in_mode_change)
-                       {
-                               SETTING_TRACE("ERROR: Currently, USB mode is being changed. It occurs when USB cable is connected before USB-setting is terminated completely.\n");
-                               return;
-                       }
+       switch(val) {
+       case VCONFKEY_SYSMAN_USB_AVAILABLE:
+               SETTING_TRACE("USB cable is connected\n");
+               ad->isUsbConnected = USB_CONNECTED;
 
-                       SETTING_TRACE("in_mode_change = IN_CHANGE\n");
-                       in_mode_change = IN_CHANGE;
+               if (IN_CHANGE == in_mode_change) {
+                       SETTING_TRACE("ERROR: Currently, USB mode is being changed. It occurs when USB cable is connected before USB-setting is terminated completely.\n");
+                       return;
+               }
+               ret = vconf_get_int(VCONFKEY_SETAPPL_USB_SEL_MODE_INT, &selMode);
+               setting_retm_if(ret != 0, "FAIL: vconf_get_int(VCONFKEY_SETAPPL_USB_SEL_MODE_INT)");
+               ret = vconf_get_int(VCONFKEY_SETAPPL_USB_MODE_INT, &curMode);
+               setting_retm_if(ret != 0, "FAIL: vconf_get_int(VCONFKEY_SETAPPL_USB_MODE_INT)");
+               if (selMode == curMode) {
+                       SETTING_TRACE("Mode Change completed\n");
+                       unload_popup();
+                       return;
+               }
 
-                       if (SETTING_RETURN_FAIL == disable_all_buttons(selMode))
-                       {
-                               SETTING_TRACE("FAIL: diable_all_buttons()\n");
-                               return;
-                       }
+               SETTING_TRACE("in_mode_change = IN_CHANGE\n");
+               in_mode_change = IN_CHANGE;
 
-                       /* The progressbar of the selected mode should be visible */
-                       set_progressbar_status(selMode);
-                       
-                       /* When USB cable is connected, the popup should be unloaded after disabling all buttons and loading progress bar */
-                       unload_popup();
-               } 
-               else 
-               {
-                       SETTING_TRACE("USB cable is not connected\n");
+               if (SETTING_RETURN_FAIL == disable_all_buttons(selMode)) {
+                       SETTING_TRACE("FAIL: diable_all_buttons()\n");
+                       return;
+               }
+
+               /* The progressbar of the selected mode should be visible */
+               set_progressbar_status(selMode);
+
+               /* When USB cable is connected, the popup should be unloaded after disabling all buttons and loading progress bar */
+               unload_popup();
+               break;
+       case VCONFKEY_SYSMAN_USB_DISCONNECTED:
+               SETTING_TRACE("USB cable is not connected\n");
 
+               if (USB_CONNECTED == ad->isUsbConnected) {
                        SETTING_TRACE("in_mode_change = IN_CHANGE\n");
                        in_mode_change = IN_CHANGE;
+               }
+               else {
+                       SETTING_TRACE("in_mode_change = NO_CHANGE\n");
+                       in_mode_change = NO_CHANGE;
+               }
+               ad->isUsbConnected = USB_DISCONNECTED;
 
-                       SETTING_TRACE("Radio set: Disconnecting USB \n");
-                       elm_radio_value_set(ad->chk_con, SETTING_USB_DEFAULT_MODE);
-                       selMode = SETTING_USB_DEFAULT_MODE;
-                       curMode = SETTING_USB_NONE_MODE;
-                       ret = vconf_set_int(VCONFKEY_SETAPPL_USB_SEL_MODE_INT, selMode);
-                       if (ret != 0)
-                       {
-                               SETTING_TRACE("FAIL: setting_get_int_slp_key(INT_SLP_SETTING_USB_MODE)\n");
-                       }
-                       unset_progressbar_status(selMode);
-                       enable_all_buttons();
-                       unload_popup();
+               SETTING_TRACE("Radio set: Disconnecting USB \n");
+               elm_radio_value_set(ad->chk_con, SETTING_USB_DEFAULT_MODE);
+               unset_progressbar_status(selMode);
+               selMode = SETTING_USB_DEFAULT_MODE;
+               curMode = SETTING_USB_NONE_MODE;
+               ret = vconf_set_int(VCONFKEY_SETAPPL_USB_SEL_MODE_INT, selMode);
+               if (ret != 0)
+               {
+                       SETTING_TRACE("FAIL: setting_get_int_slp_key(INT_SLP_SETTING_USB_MODE)\n");
                }
+               enable_all_buttons();
+               unload_popup();
+               break;
+       default:
+               break;
        }
-
        SETTING_TRACE_END;
 }
 
@@ -614,7 +619,8 @@ static void mode_change_vconf_cb(keynode_t *key, void *data)
 
        /* When USB cable is connected, current mode is changed to selected mode.
         * When USB cable is not connceted, current mode is SETTING_USB_NONE_MODE. */
-       if (check_usb_jack_status() == USB_CONNECTED)
+       ad->isUsbConnected = check_usb_jack_status();
+       if (ad->isUsbConnected == USB_CONNECTED)
        {
                /* The progressbar of the selected mode is visible */
                unset_progressbar_status(selMode);
@@ -670,19 +676,11 @@ static int setting_connectivity_usb_destroy(void *cb)
                SETTING_TRACE("FAIL: vconf_ignore_key_changed(VCONFKEY_SETAPPL_USB_MODE_INT)\n");
                num_err++;
        }
-
-       /* Closing heynoti */
-       if (ad->noti_fd != -1)  /* first need to check the fd validation */
+       vconf_ret = vconf_ignore_key_changed(VCONFKEY_SYSMAN_USB_STATUS, usb_status_vconf_cb);
+       if (vconf_ret != 0)
        {
-               if(heynoti_unsubscribe(ad->noti_fd, "device_usb_chgdet", usb_chgdet_cb) < 0)
-               {
-                       SETTING_TRACE("ERROR: heynoti_unsubscribe()\n");
-                       num_err++;
-               }
-
-               /* heynoti_detach_handler() will be done in heynoti_close(). */
-               heynoti_close(ad->noti_fd);
-               ad->noti_fd = -1;
+               SETTING_TRACE("FAIL: vconf_ignore_key_changed(VCONFKEY_SYSMAN_USB_STATUS)\n");
+               num_err++;
        }
 
        if (ad->ly_usb != NULL) {
@@ -728,6 +726,7 @@ static int setting_connectivity_usb_update(void *cb)
                }
                else    /* curMode != SETTING_USB_NONE_MODE */
                {
+                       SETTING_TRACE("Radio set: when updating view \n");
                        elm_radio_value_set(ad->chk_con, curMode);
                }
 
index bd00382..9854f0d 100644 (file)
@@ -320,8 +320,14 @@ static int setting_reset_display_backlight(void)
        SETTING_TRACE_BEGIN;
        int ret = 0;
 
-       ret += vconf_set_int(VCONFKEY_SYSMAN_LCD_TIMEOUT_NORMAL,
-                         SETTING_BACKLIGHT_TIME_30SEC);
+       if (isEmulBin()) {
+               ret += vconf_set_int(VCONFKEY_SYSMAN_LCD_TIMEOUT_NORMAL,
+                               SETTING_BACKLIGHT_TIME_10MIN);
+       }
+       else {
+               ret += vconf_set_int(VCONFKEY_SYSMAN_LCD_TIMEOUT_NORMAL,
+                               SETTING_BACKLIGHT_TIME_30SEC);
+       }
        SETTING_TRACE_END;
        return ret;
 }
@@ -336,6 +342,16 @@ static int setting_reset_home_wallpaper(void)
        return ret;
 }
 
+/*  NESTED*/
+static int setting_reset_display_lc_screen(void)
+{
+       SETTING_TRACE_BEGIN;
+       int ret = 0;
+       ret += vconf_set_str(VCONFKEY_IDLE_LOCK_BGSET, IMG_DEFAULT_HOME_SCREEN);
+       ret += setting_invoke_reset_function("/opt/ug/lib/libug-setting-lock.so", NULL, NULL);
+       return ret;
+}
+
 static void setting_reset_launch_effect()
 {
        SETTING_TRACE_BEGIN;
@@ -350,7 +366,7 @@ static void setting_reset_launch_effect()
        {
                Ecore_X_Atom effect_enable_atom = ecore_x_atom_get("_NET_CM_EFFECT_ENABLE");
                ret_if(!effect_enable_atom);
-               unsigned int is_enable = 1;
+               unsigned int is_enable = 0;
                ecore_x_window_prop_card32_set(root, effect_enable_atom, &is_enable, 1);
        }
 
@@ -390,6 +406,7 @@ UG_MODULE_API int setting_plugin_reset(bundle *data, void *priv)
                ret += setting_invoke_reset_function("/opt/ug/lib/libug-setting-lock.so", NULL, NULL);
 #else
                ret += setting_reset_home_wallpaper();
+               ret += setting_reset_display_lc_screen();
 #endif
                
        } else if (0 == safeStrCmp(ug_type, "main")) {
index 7ab47cc..2b97077 100644 (file)
@@ -57,7 +57,7 @@
 #define SETTING_MEMORY_STATUS_UNMOUNT_SD_CARD_DESC "IDS_ST_BODY_UNMOUNT_SD_CARD"
 #define SETTING_MEMORY_STATUS_FORMAT_SD_CARD_DESC "IDS_ST_BODY_FORMAT_SD_CARD"
 #define SETTING_MEMORY_STATUS_INTERNAL_SD_CARD_DESC "Internal SD card"
-#define SETTING_MEMORY_STATUS_INTERNAL_PHONE_STORAGE_DESC "Internal phone storage"
+#define SETTING_MEMORY_STATUS_INTERNAL_PHONE_STORAGE_DESC "IDS_COM_BODY_SYSTEM_STORAGE"
 #define SETTING_MEMORY_STATUS_MAIN_STORAGE_DESC "Main storage"
 
 #define SETTING_MEMORY_STATUS_FORMAT_ASK_MSG "This action will erase the<br>external storage in the phone.<br>You will lost ALL data on the card!<br>Format?"
old mode 100644 (file)
new mode 100755 (executable)
index fae80ea..9690b8d
@@ -110,6 +110,19 @@ static int setting_phone_region_format_get_region_fmt(char *list[],
                str_variant = setting_phone_lang_str_to_utf8(variant);
                str_displayname = setting_phone_lang_str_to_utf8(displayname);
 
+               /* to do : filter Chinese and Japanese */
+               SETTING_TRACE_DEBUG("str_lang : %s", str_lang);
+               if((safeStrCmp(str_lang, _("IDS_ST_BODY_JAPANESE")) == 0)
+                               || (safeStrCmp(str_lang, _("IDS_COM_OPT_CHINESE_VODA")) == 0))
+               {
+                       FREE(str_lang);
+                       FREE(str_country);
+                       FREE(str_variant);
+                       FREE(str_displayname);
+                       continue;
+               }
+               /* end */
+
                /*  filter which has variant */
                if (str_lang != NULL && str_country != NULL
                    && safeStrLen(str_country) > 1 && safeStrLen(str_variant) == 0) {
@@ -367,7 +380,7 @@ static Eina_Bool __region_genlist_update(void *data)
        if (ad->selected_region_idx > -1) {
                elm_radio_value_set(ad->chk_region, ad->selected_region_idx);
        }
-
+       ad->search_idler = NULL;
        return ECORE_CALLBACK_CANCEL;
 }
 
@@ -395,7 +408,7 @@ static int setting_phone_region_format_create(void *cb)
 
        SettingPhoneUG *ad = (SettingPhoneUG *) cb;
        Evas_Object *sub_layout = elm_layout_add(ad->navi_bar);
-       elm_layout_theme_set(sub_layout, "layout", "application", "searchbar");
+       elm_layout_theme_set(sub_layout, "layout", "application", "searchbar_base");
        elm_object_signal_emit(sub_layout, "elm,state,show,searchbar", "elm");
 
        setting_push_layout_navi_bar(_("Region format"),
index b8c4f6e..bf6ccae 100644 (file)
@@ -442,6 +442,8 @@ static Evas_Object *__get_main_list(void *data)
        } else {
                SETTING_TRACE_ERROR("ad->data_sound is NULL");
        }
+
+#ifdef SUPPORT_VIB
        /* b.use vib */
        if (vconf_get_bool(VCONFKEY_SETAPPL_VIBRATION_STATUS_BOOL, &vconf_value) < 0)
                vconf_value = TRUE;     /*  default value of vibration : on */
@@ -457,6 +459,7 @@ static Evas_Object *__get_main_list(void *data)
        } else {
                SETTING_TRACE_ERROR("ad->data_vibration is NULL");
        }
+#endif
 
        (void)setting_create_Gendial_field_titleItem(genlist,
                                                     &(ad->itc_group_item),
@@ -559,15 +562,15 @@ static Evas_Object *__get_main_list(void *data)
        } else {
                SETTING_TRACE_ERROR("ad->data_touch_volume is NULL");
        }
-
+#ifdef SUPPORT_VIB
        (void)setting_create_Gendial_field_titleItem(genlist,
                                                     &(ad->itc_group_item),
                                                     "IDS_ST_BODY_CALLALERTTYPE_VIBRATION", NULL);
 
        /* f.noti vib */
-       if (vconf_get_int(VCONFKEY_SETAPPL_NOTI_VIBRATION_LEVEL_INT, &vconf_value) <
-           0)
+       if (vconf_get_int(VCONFKEY_SETAPPL_NOTI_VIBRATION_LEVEL_INT, &vconf_value) < 0)
                vconf_value = SETTING_DEFAULT_NOTI_VIB_INT;     /*  default value of notification vibration volume : 5 */
+
        ad->data_vib_volume =
            setting_create_Gendial_field_def(genlist, &(ad->itc_layout), NULL,
                                             NULL,
@@ -614,6 +617,7 @@ static Evas_Object *__get_main_list(void *data)
        } else {
                SETTING_TRACE_ERROR("ad->data_touch_vib is NULL");
        }
+#endif
 
        setting_create_Gendial_field_def(genlist, &(ad->itc_bg_1icon),
                                         NULL, ad,
index 17c94c4..8b0f0cd 100644 (file)
@@ -197,8 +197,10 @@ bool __reset_all_idler(void *data)
                                path = get_ug_path_from_ug_args((void *)ug_args);
                                b = get_bundle_from_ug_args((void *)ug_args);
                                
-                               if (snprintf(ug_file, PATH_MAX, "%s/libug-%s.so", SETTING_UG_PATH, path) < 0) 
+                               if (snprintf(ug_file, PATH_MAX, "%s/libug-%s.so", SETTING_UG_PATH, path) < 0) {
+                                       ad->reset_all_idler = NULL;
                                        return FALSE;
+                               }
                                        
                                ret = setting_invoke_reset_function(ug_file, b, NULL);
                                //SETTING_TRACE("load %s[plugin_ret:%d]", ug_file, ret);
@@ -223,6 +225,7 @@ bool __reset_all_idler(void *data)
        SETTING_TRACE_DEBUG("Reset totally %d items. result_str:%s", idx, result_str);
        elm_object_text_set(ad->notify, _(result_str));
        elm_popup_timeout_set(ad->notify, 2);
+       ad->reset_all_idler = NULL;
        return FALSE;
 }
 
index dfc8eed..85584bb 100755 (executable)
@@ -52,5 +52,6 @@ Eina_Bool setting_time_update_cb(void *data)
        }
        /* other module (ex. Indicator ) receives SETTING_TIME_CHANGED heynoti */
        heynoti_publish(SETTING_TIME_CHANGED);
+       ad->heynoti_timer = NULL;
        return ECORE_CALLBACK_CANCEL;
 }
index f41214e..11ae1ae 100755 (executable)
@@ -176,6 +176,13 @@ bool setting_update_timezone(SettingTimeUG *ad)
        return 0;
 }
 
+bool __update_timezone_idler(SettingTimeUG *ad)
+{
+       setting_update_timezone(ad);
+       ad->update_timezone_idler = NULL;
+       return 0;
+}
+
 static void setting_time_main_int_vconf_change_cb(keynode_t *key, void *data)
 {
        SETTING_TRACE_BEGIN;
@@ -548,27 +555,34 @@ static int setting_time_main_create(void *cb)
        int err;
        int ret = 0;
        Elm_Object_Item *item;
+       bool auto_flag = TRUE;
 
-       item =
-           elm_genlist_item_append(scroller, &(ad->itc_seperator), NULL, NULL,
-                                   ELM_GENLIST_ITEM_NONE, NULL, NULL);
-       elm_genlist_item_select_mode_set(item, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
-       setting_get_bool_slp_key(BOOL_SLP_SETTING_AUTOMATIC_TIME_UPDATE, &value,
-                                &err);
-       bool auto_flag = value;
-
-       /*  UI automatic */
-       ad->data_auto =
-           setting_create_Gendial_field_def(scroller, &(ad->itc_1text_1icon),
+       if(!isEmulBin())
+       {
+               item = elm_genlist_item_append(scroller, &(ad->itc_seperator), NULL, NULL,
+                                                                               ELM_GENLIST_ITEM_NONE, NULL, NULL);
+               elm_genlist_item_select_mode_set(item, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
+               setting_get_bool_slp_key(BOOL_SLP_SETTING_AUTOMATIC_TIME_UPDATE, &value, &err);
+               auto_flag = value;
+
+               /*  UI automatic */
+               ad->data_auto =
+               setting_create_Gendial_field_def(scroller, &(ad->itc_1text_1icon),
                                             setting_time_main_mouse_up_Gendial_list_cb,
                                             ad, SWALLOW_Type_1TOGGLE, NULL,
                                             NULL, value,
                                             "IDS_ST_BODY_AUTOMATIC_UPDATE", NULL,
                                             setting_time_main_chk_btn_cb);
-       if (ad->data_auto) {
-               ad->data_auto->userdata = ad;
-       } else {
-               SETTING_TRACE_ERROR("ad->data_auto is NULL");
+               if (ad->data_auto) {
+                       ad->data_auto->userdata = ad;
+               } else {
+                       SETTING_TRACE_ERROR("ad->data_auto is NULL");
+               }
+       }
+       else
+       {
+               setting_set_bool_slp_key(BOOL_SLP_SETTING_AUTOMATIC_TIME_UPDATE, FALSE, &err);
+               auto_flag = FALSE;
        }
 
        /*  UI add separator */
@@ -813,7 +827,7 @@ static int setting_time_main_update(void *cb)
                        ad->update_timezone_idler = NULL;
                }
                ad->update_timezone_idler =
-                   ecore_idler_add((Ecore_Task_Cb) setting_update_timezone, ad);
+                   ecore_idler_add((Ecore_Task_Cb) __update_timezone_idler, ad);
                // update time
                if (ad->refresh_time_idler) {
                        ecore_idler_del(ad->refresh_time_idler);
@@ -1025,7 +1039,7 @@ Eina_Bool setting_update_datefield(void *cb)
        SettingTimeUG *ad = (SettingTimeUG *) cb;
 
        __refresh_date_timer(ad);
-
+       ad->refresh_time_idler = NULL;
        return 0;
 }
 
index eb47193..76a5183 100755 (executable)
@@ -1,3 +1,6 @@
+msgid "IDS_COM_BODY_SYSTEM_STORAGE"
+msgstr "Systemspeicher"
+
 msgid "IDS_COM_POP_UNSUPPORTED"
 msgstr "Nicht unterstützt"
 
@@ -2905,4 +2908,8 @@ msgstr "Wi-Fi Direct"
 msgid "IDS_ST_POP_INCORRECT_PASSWORD"
 msgstr "Falsches Passwort"
 
+msgid "IDS_COM_OPT_CHINESE_VODA"
+msgstr "Chinesisch"
 
+msgid "IDS_ST_BODY_JAPANESE"
+msgstr "Japanisch"
index 9e3f673..5234a36 100755 (executable)
@@ -1,3 +1,6 @@
+msgid "IDS_COM_BODY_SYSTEM_STORAGE"
+msgstr "Χώρος αποθήκευσης συστήματος"
+
 msgid "IDS_COM_POP_UNSUPPORTED"
 msgstr "Δεν υποστηρίζεται"
 
@@ -2904,3 +2907,9 @@ msgstr "Wi-Fi Direct"
 
 msgid "IDS_ST_POP_INCORRECT_PASSWORD"
 msgstr "Λάθος κωδικός"
+
+msgid "IDS_COM_OPT_CHINESE_VODA"
+msgstr "Κινεζικά"
+
+msgid "IDS_ST_BODY_JAPANESE"
+msgstr "Ιαπωνικά"
index b9635cd..52056f3 100755 (executable)
@@ -1,3 +1,6 @@
+msgid "IDS_COM_BODY_SYSTEM_STORAGE"
+msgstr "System storage"
+
 msgid "IDS_COM_POP_UNSUPPORTED"
 msgstr "Unsupported"
 
@@ -2905,4 +2908,8 @@ msgstr "Wi-Fi Direct"
 msgid "IDS_ST_POP_INCORRECT_PASSWORD"
 msgstr "Incorrect password"
 
+msgid "IDS_COM_OPT_CHINESE_VODA"
+msgstr "Chinese"
 
+msgid "IDS_ST_BODY_JAPANESE"
+msgstr "Japanese"
index 618ed57..3cdc515 100755 (executable)
@@ -1,3 +1,6 @@
+msgid "IDS_COM_BODY_SYSTEM_STORAGE"
+msgstr "Almacenamiento del sistema"
+
 msgid "IDS_COM_POP_UNSUPPORTED"
 msgstr "No admitido"
 
@@ -2905,4 +2908,9 @@ msgstr "Wi-Fi Direct"
 msgid "IDS_ST_POP_INCORRECT_PASSWORD"
 msgstr "Contraseña incorrecta"
 
+msgid "IDS_COM_OPT_CHINESE_VODA"
+msgstr "Chino"
+
+msgid "IDS_ST_BODY_JAPANESE"
+msgstr "Japonés"
 
index dcbb574..438a0d3 100755 (executable)
@@ -1,3 +1,6 @@
+msgid "IDS_COM_BODY_SYSTEM_STORAGE"
+msgstr "Stockage système"
+
 msgid "IDS_COM_POP_UNSUPPORTED"
 msgstr "Non pris en charge"
 
@@ -2905,5 +2908,9 @@ msgstr "Wi-Fi Direct"
 msgid "IDS_ST_POP_INCORRECT_PASSWORD"
 msgstr "Mot de passe incorrect"
 
+msgid "IDS_COM_OPT_CHINESE_VODA"
+msgstr "Chinois"
 
+msgid "IDS_ST_BODY_JAPANESE"
+msgstr "Japonais"
 
index 4669540..3b57371 100755 (executable)
@@ -1,3 +1,6 @@
+msgid "IDS_COM_BODY_SYSTEM_STORAGE"
+msgstr "Memoria di sistema"
+
 msgid "IDS_COM_POP_UNSUPPORTED"
 msgstr "Non supportato"
 
@@ -2905,5 +2908,9 @@ msgstr "Wi-Fi Direct"
 msgid "IDS_ST_POP_INCORRECT_PASSWORD"
 msgstr "Password errata"
 
+msgid "IDS_COM_OPT_CHINESE_VODA"
+msgstr "Cinese"
 
+msgid "IDS_ST_BODY_JAPANESE"
+msgstr "Giapponese"
 
index 869a365..3b53c02 100755 (executable)
@@ -1,3 +1,6 @@
+msgid "IDS_COM_BODY_SYSTEM_STORAGE"
+msgstr "시스템 메모리"
+
 msgid "IDS_COM_POP_UNSUPPORTED"
 msgstr "지원되지 않습니다"
 
@@ -2905,7 +2908,11 @@ msgstr "Wi-Fi Direct"
 msgid "IDS_ST_POP_INCORRECT_PASSWORD"
 msgstr "비밀번호가 바르지 않습니다"
 
+msgid "IDS_COM_OPT_CHINESE_VODA"
+msgstr "중국어"
 
+msgid "IDS_ST_BODY_JAPANESE"
+msgstr "일본어"
 
 
 
index 4c66772..dd93062 100755 (executable)
@@ -1,3 +1,6 @@
+msgid "IDS_COM_BODY_SYSTEM_STORAGE"
+msgstr "Systeemopslag"
+
 msgid "IDS_COM_POP_UNSUPPORTED"
 msgstr "Niet ondersteund"
 
@@ -2905,6 +2908,10 @@ msgstr "Wi-Fi Direct"
 msgid "IDS_ST_POP_INCORRECT_PASSWORD"
 msgstr "Wachtwoord onjuist"
 
+msgid "IDS_COM_OPT_CHINESE_VODA"
+msgstr "Chinees"
 
+msgid "IDS_ST_BODY_JAPANESE"
+msgstr "Japans"
 
 
index 97e3086..f54ced1 100755 (executable)
@@ -1,3 +1,6 @@
+msgid "IDS_COM_BODY_SYSTEM_STORAGE"
+msgstr "Memória do sistema"
+
 msgid "IDS_COM_POP_UNSUPPORTED"
 msgstr "Não suportado"
 
@@ -2905,6 +2908,10 @@ msgstr "Wi-Fi Direct"
 msgid "IDS_ST_POP_INCORRECT_PASSWORD"
 msgstr "Palavra-passe incorrecta"
 
+msgid "IDS_COM_OPT_CHINESE_VODA"
+msgstr "Chinês"
 
+msgid "IDS_ST_BODY_JAPANESE"
+msgstr "Japonês"
 
 
index 4d58432..c0d1091 100755 (executable)
@@ -1,3 +1,6 @@
+msgid "IDS_COM_BODY_SYSTEM_STORAGE"
+msgstr "Системная память"
+
 msgid "IDS_COM_POP_UNSUPPORTED"
 msgstr "Не поддерживается"
 
@@ -2905,7 +2908,11 @@ msgstr "Wi-Fi Direct"
 msgid "IDS_ST_POP_INCORRECT_PASSWORD"
 msgstr "Неправильный пароль"
 
+msgid "IDS_COM_OPT_CHINESE_VODA"
+msgstr "Китайский"
 
+msgid "IDS_ST_BODY_JAPANESE"
+msgstr "Японский"
 
 
 
index d70d4bf..10143a4 100755 (executable)
@@ -1,3 +1,6 @@
+msgid "IDS_COM_BODY_SYSTEM_STORAGE"
+msgstr "Sistem belleği"
+
 msgid "IDS_COM_POP_UNSUPPORTED"
 msgstr "Desteklenmeyen"
 
@@ -2905,3 +2908,8 @@ msgstr "Wi-Fi Direct"
 msgid "IDS_ST_POP_INCORRECT_PASSWORD"
 msgstr "Yanlış şifre"
 
+msgid "IDS_COM_OPT_CHINESE_VODA"
+msgstr "Įince"
+
+msgid "IDS_ST_BODY_JAPANESE"
+msgstr "Japonca"