Remove date&time item in reset setting and add activated callback in search bar

Change-Id: I5990b3c04613e6d1d27291d058ba448a8d37cca3

diff --git a/setting-common/src/setting-common-draw-searchbar.c b/setting-common/src/setting-common-draw-searchbar.c
index 1b432bd..1cb646a 100755 (executable)
--- a/setting-common/src/setting-common-draw-searchbar.c
+++ b/setting-common/src/setting-common-draw-searchbar.c
@@ -93,6 +93,15 @@ static void __searchbar_unfocused_cb(void *data, Evas_Object *obj, void *event_i
        elm_object_signal_emit(searchbar_layout, "elm,state,eraser,hide", "elm");
 }
 
+static void __searchbar_activated_cb(void *data, Evas_Object *obj, void *event_info)
+{
+       ret_if(!obj);
+       Evas_Object *searchbar_layout = data;
+       Evas_Object *entry = elm_object_part_content_get(searchbar_layout, "elm.swallow.content");
+       ret_if(!entry);
+       elm_object_focus_set(entry, EINA_FALSE);
+}
+
 static void __searchbar_eraser_clicked_cb(void *data, Evas_Object *obj, const char *emission, const char *source)
 {
        ret_if(!data);
@@ -152,6 +161,7 @@ Evas_Object *setting_create_searchbar(void *data, Evas_Object *parent,
        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);
+       evas_object_smart_callback_add(entry, "activated", __searchbar_activated_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"));

diff --git a/setting-reset/src/setting-reset-settings.c b/setting-reset/src/setting-reset-settings.c
index 80468c3..9cdffc0 100755 (executable)
--- a/setting-reset/src/setting-reset-settings.c
+++ b/setting-reset/src/setting-reset-settings.c
@@ -306,6 +306,8 @@ static int setting_reset_settings_create(void *cb)
                                        continue; /* hide Network in Emulator*/
                                } else if (!safeStrCmp(KeyStr_Bluetooth, item_name)) {
                                        continue; /* hide Bluetooth in Emulator*/
+                               } else if (!safeStrCmp(KeyStr_DateTime, item_name)) {
+                                       continue; /* hide Date&Time in Emulator*/
                                } else if (!safeStrCmp(KeyStr_Security, item_name)) {
                                        continue; /* hide Security in Emulator*/
                                } else if (!safeStrCmp(KeyStr_Memory, item_name)) {