Add support for PR3 battery device name

[apps/core/preloaded/settings.git] / setting-about / src / setting-about-main.c

diff --git a/setting-about/src/setting-about-main.c b/setting-about/src/setting-about-main.c
index 066eb68..01a17b1 100755 (executable)
--- a/setting-about/src/setting-about-main.c
+++ b/setting-about/src/setting-about-main.c
@@ -1,22 +1,18 @@
 /*
  * 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.0 (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-about-main.h>
@@ -317,12 +313,18 @@ void setting_about_main_get_wifi_mac_address_string(char *str, int size)
 void setting_about_main_get_battery_string(char *str, int size)
 {
        setting_retm_if(str == NULL, "str parameter is NULL");
+       struct stat fileAttrs;
 
        int val = -1;
        char file[MAX_DISPLAY_STR_LEN_ON_PHONE_INFO] = { 0, };
        snprintf(file, MAX_DISPLAY_STR_LEN_ON_PHONE_INFO,
                 "%s/%s/%s", SETTING_ABOUT_POWER_SUPPLY_PATH, "battery", "capacity");
 
+       /* If Samsung battery not found, check if this is PR3 */
+       if (stat(file, &fileAttrs) < 0)
+               snprintf(file, MAX_DISPLAY_STR_LEN_ON_PHONE_INFO,
+                  "%s/%s/%s", SETTING_ABOUT_POWER_SUPPLY_PATH, "max170xx_battery", "capacity");
+
        char buf[MAX_DISPLAY_STR_LEN_ON_PHONE_INFO] = { 0, };
        int fd = 0;
        int r = 0;
@@ -569,6 +571,7 @@ static void __entry_unfocus_cb(void *data, Evas_Object *obj, void *event_info)
        setting_hide_input_pannel_cb(item_dev_name->eo_check);
        if (item_dev_name) {
                if (ad->empty_flag) {
+                       FREE(entry_str_utf8);
                        return;
                } else {
                }
@@ -685,34 +688,42 @@ int setting_about_generate_genlist(void *data)
                SETTING_TRACE(">>>>>>>>>>>>>>>>>> UNINSTALLED PACKAGE");
                ad->item_dev_name = NULL;
        } else {
+               Setting_GenGroupItem_Data *item_data = (Setting_GenGroupItem_Data *)calloc(1, sizeof(Setting_GenGroupItem_Data));
+               if (!item_data)
+                       FREE(pa_sub_desc);
+
+               setting_retvm_if(!item_data, NULL, "calloc failed");
+
+               item_data->keyStr = (char *)g_strdup(SETTING_ABOUT_DEVICE_NAME_STR);
+               item_data->sub_desc = (char *)g_strdup(pa_sub_desc);
+               item_data->swallow_type = SWALLOW_Type_LAYOUT_ENTRY;
+               item_data->chk_status = 0;
+               item_data->chk_change_cb = __setting_about_device_name_changed_cb;
+               item_data->userdata = ad;
+               item_data->isSinglelineFlag = TRUE;
+               item_data->maxlength_reached_cb = __max_len_reached;
+               item_data->start_change_cb = (setting_call_back_func)__entry_key_down_cb;
+               item_data->stop_change_cb = __entry_unfocus_cb;
+               item_data->x_callback_cb = _input_panel_event_cb;
+
+               item_data->limit_filter_data = calloc(1, sizeof(Elm_Entry_Filter_Limit_Size));
+               if (item_data->limit_filter_data) {
+                       //max byte len is 31 not 31+1
+                       //ad->item_dev_name->limit_filter_data->max_byte_count = MAX_DEVICE_NAME_LEN + OFFESET_ENTRY_FILTER;
+                       item_data->limit_filter_data->max_byte_count = MAX_DEVICE_NAME_LEN;
+                       item_data->win_main = ad->win_get;
+               }
 
-               ad->item_dev_name =
-                       setting_create_Gendial_field_def(scroller, &(itc_1icon),
-                                                                setting_about_main_mouse_up_Gendial_list_cb,
-                                                        ad, SWALLOW_Type_LAYOUT_ENTRY,
-                                                        NULL, NULL, 0, SETTING_ABOUT_DEVICE_NAME_STR, pa_sub_desc,
-                                                        __setting_about_device_name_changed_cb);
-               if (ad->item_dev_name) {
-                       ad->item_dev_name->userdata = ad;
-                       ad->item_dev_name->isSinglelineFlag = TRUE;
-                       ad->item_dev_name->start_change_cb = (setting_call_back_func)__entry_key_down_cb;
-                       ad->item_dev_name->stop_change_cb = __entry_unfocus_cb;
-                       ad->item_dev_name->maxlength_reached_cb = __max_len_reached;
-                       ad->item_dev_name->x_callback_cb = _input_panel_event_cb;
-                       ad->item_dev_name->limit_filter_data = calloc(1, sizeof(Elm_Entry_Filter_Accept_Set));
-
-                       if (ad->item_dev_name->limit_filter_data) {
-                               //max byte len is 31 not 31+1
-                               //ad->item_dev_name->limit_filter_data->max_byte_count = MAX_DEVICE_NAME_LEN + OFFESET_ENTRY_FILTER;
-                               ad->item_dev_name->limit_filter_data->max_byte_count = MAX_DEVICE_NAME_LEN;
-                               ad->item_dev_name->win_main = ad->win_get;
-                       }
-                       //ad->item_dev_name->input_type = ELM_INPUT_PANEL_LAYOUT_NUMBER;
-                       ad->item_dev_name->input_panel_disable_flag = EINA_TRUE;
+               item_data->input_panel_disable_flag = EINA_TRUE;
 
+               item_data->item = elm_genlist_item_append(scroller, &(itc_1icon), item_data, NULL, ELM_GENLIST_ITEM_NONE,
+                                               setting_about_main_mouse_up_Gendial_list_cb, ad);
+
+               ad->item_dev_name = item_data;
+               if (ad->item_dev_name) {
                        elm_genlist_item_select_mode_set(ad->item_dev_name->item, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
                } else {
-                               SETTING_TRACE_ERROR("ad->item_dev_name is NULL");
+                       SETTING_TRACE_ERROR("ad->item_dev_name is NULL");
                }
        }
        FREE(pa_sub_desc);