/*
* setting
+ * Copyright (c) 2012 Samsung Electronics Co., Ltd.
*
- * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd.
- *
- * Contact: MyoungJune Park <mj2004.park@samsung.com>
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed under the Flora License, Version 1.1 (the License);
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://floralicense.org/license/
*
* Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
+ * distributed under the License is distributed on an AS IS BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- *
*/
#include <setting-cfg.h>
#include <setting-reset-settings.h>
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)) {
ad->reset_all_idler = NULL;
}
+ ad->pop_btn = NULL;
+
elm_naviframe_item_pop(ad->navi_bar);
setting_view_reset_settings.is_create = 0;
(char *)item_name,
(char *)result_str, NULL);
ecore_idler_add((Ecore_Task_Cb) __delay_reset_location, item_data);
+
+ service_destroy(svc);
+ FREE(path);
return;
}
evas_object_del(ad->pop_progress);
ad->pop_progress = NULL;
}
- Evas_Object *btn = elm_object_part_content_get(ad->notify, "button1");
- if (btn)
+ //Evas_Object *btn = elm_object_part_content_get(ad->notify, "button1");
+ if (ad->pop_btn)
{
- setting_enable_evas_object(btn);
- setting_undo_dim_evas_object(btn, TRUE);
+ setting_enable_evas_object(ad->pop_btn);
+ setting_undo_dim_evas_object(ad->pop_btn, TRUE);
}
Evas_Object *genlist = elm_object_content_get(ad->notify);
elm_object_style_set(btn, "popup_button/default");
setting_disable_evas_object(btn);
setting_dim_evas_object(btn, TRUE);
+ ad->pop_btn = btn;
Evas_Object *genlist = elm_genlist_add(ad->notify);
elm_object_style_set(genlist, "dialogue");
case UG_MODE_FULLVIEW:
evas_object_size_hint_weight_set(base, EVAS_HINT_EXPAND,
EVAS_HINT_EXPAND);
- elm_win_resize_object_add(ad->win_get, base);
+ //elm_win_resize_object_add(ad->win_get, base);
evas_object_show(base);
break;
default: