Revert "Some functionalities are hidden before prebeta release"

This reverts commit 0f5bcda391913f6767089d9b2701a0ec434d7552.

Conflicts:
	include/layout.h

Change-Id: I213d27a5730915c6eda86be331629aa19d5a2aa2
Signed-off-by: Radek Kintop <r.kintop@samsung.com>

diff --git a/include/layout.h b/include/layout.h
index dcae6e6..b96cf32 100644 (file)
--- a/include/layout.h
+++ b/include/layout.h
@@ -19,9 +19,6 @@
 
 #include "common/layoutmgr.h"
 
-/*release changes:*/
-#define LAYOUT_MAX 2
-
 /**
 * @brief Available layout types.
 */
@@ -34,7 +31,7 @@ enum layout_type {
        LAYOUT_SUPPORT,
        LAYOUT_INFO,
        LAYOUT_VOICE,
-
+       LAYOUT_MAX
 };
 
 /**

diff --git a/src/layout/layout_system.c b/src/layout/layout_system.c
index 0697a4e..2169282 100644 (file)
--- a/src/layout/layout_system.c
+++ b/src/layout/layout_system.c
@@ -75,11 +75,11 @@ void set_callback_for_sleep_timer_change(void *data);
 void set_callback_for_system_location_change(void *data);
 
 static struct menumgr_info menu_info[] = {
-       /*{
+       {
                .id = MENU_CLOCK,
                .title = STR_CLOCK,
                .style = STYLE_STATUS_BTN,
-               .disabled = EINA_TRUE,
+               .disabled = EINA_FALSE,
                .favorite = EINA_FALSE,
                .status = _get_clock_mode,
                .selected = _selected,
@@ -88,7 +88,7 @@ static struct menumgr_info menu_info[] = {
                .progress_value = NULL,
                .progress_evas = NULL,
                .update_cb = settings_clock_set_state_update_callbacks
-       },*/
+       },
        {
                .id = MENU_SLEEP_TIMER,
                .title = STR_SLEEP_TIMER,
@@ -101,12 +101,12 @@ static struct menumgr_info menu_info[] = {
                .progress_value = NULL,
                .progress_evas = NULL,
                .update_cb = set_callback_for_sleep_timer_change
-       },/*
+       },
        {
                .id = MENU_WAKEUP_TIMER,
                .title = STR_WAKEUP_TIMER,
                .style = STYLE_TEXTBLOCK_BTN,
-               .disabled = EINA_TRUE,
+               .disabled = EINA_FALSE,
                .status = _get_wakeup_timer,
                .selected = _selected,
                .focused = _focused,
@@ -119,14 +119,14 @@ static struct menumgr_info menu_info[] = {
                .id = MENU_CHANGE_PINCODE,
                .title = STR_CHANGE_PINCODE,
                .style = STYLE_NORMAL_BTN,
-               .disabled = EINA_TRUE,
+               .disabled = EINA_FALSE,
                .selected = _selected,
                .focused = _focused,
                .selected_menu = _selected_menu,
                .progress_value = NULL,
                .progress_evas = NULL,
                .update_cb = NULL
-       },*/
+       },
        {
                .id = MENU_LANGUAGE,
                .title = STR_LANGUAGE,
@@ -139,12 +139,12 @@ static struct menumgr_info menu_info[] = {
                .progress_value = NULL,
                .progress_evas = NULL,
                .update_cb = settings_language_set_state_update_callbacks
-       }/*,
+       },
        {
                .id = MENU_SUBTITLE,
                .title = STR_SUBTITLE,
                .style = STYLE_STATUS_BTN,
-               .disabled = EINA_TRUE,
+               .disabled = EINA_FALSE,
                .status = _get_subtitle,
                .selected = _selected,
                .focused = _focused,
@@ -152,7 +152,7 @@ static struct menumgr_info menu_info[] = {
                .progress_value = NULL,
                .progress_evas = NULL,
                .update_cb = settings_language_set_subtitle_state_update_callbacks
-       }*/,
+       },
        {
                .id = MENU_LOCATION,
                .title = STR_LOCATION,
@@ -165,19 +165,19 @@ static struct menumgr_info menu_info[] = {
                .progress_value = NULL,
                .progress_evas = NULL,
                .update_cb = set_callback_for_system_location_change
-       }/*,
+       },
        {
                .id = MENU_RESET,
                .title = STR_RESET,
                .style = STYLE_NORMAL_BTN,
-               .disabled = EINA_TRUE,
+               .disabled = EINA_FALSE,
                .selected = _selected,
                .focused = _focused,
                .selected_menu = _selected_menu,
                .progress_value = NULL,
                .progress_evas = NULL,
                .update_cb = NULL
-       },*/
+       },
 };
 /*
 static char *_get_clock_mode(void *data, int id)

diff --git a/src/view/view_base.c b/src/view/view_base.c
index 7a94995..6edb02d 100644 (file)
--- a/src/view/view_base.c
+++ b/src/view/view_base.c
@@ -29,7 +29,6 @@
 #include "view/view_action_menu.h"
 #include "view/view_base.h"
 
-
 struct _priv {
        Evas_Object *win;
        Evas_Object *base;
@@ -48,24 +47,24 @@ struct _menu_data {
 };
 
 static struct _menu_data _mdata[LAYOUT_MAX] = {
-/*     {
+       {
                .name = STR_PICTURE,
                .layout_id = LAYOUT_ID_PICTURE,
                .get_lclass = layout_picture_get_lclass,
-               .enable = EINA_FALSE
+               .enable = EINA_TRUE
        },
        {
                .name = STR_SOUND,
                .layout_id = LAYOUT_ID_SOUND,
                .get_lclass = layout_sound_get_lclass,
-               .enable = EINA_FALSE
+               .enable = EINA_TRUE
        },
        {
                .name = STR_CHANNEL,
                .layout_id = LAYOUT_ID_CHANNEL,
                .get_lclass = layout_channel_get_lclass,
-               .enable = EINA_FALSE
-       },*/
+               .enable = EINA_TRUE
+       },
        {
                .name = STR_NETWORK,
                .layout_id = LAYOUT_ID_NETWORK,
@@ -77,12 +76,12 @@ static struct _menu_data _mdata[LAYOUT_MAX] = {
                .layout_id = LAYOUT_ID_SYSTEM,
                .get_lclass = layout_system_get_lclass,
                .enable = EINA_TRUE
-       }/*,
+       },
        {
                .name = STR_SUPPORT,
                .layout_id = LAYOUT_ID_SUPPORT,
                .get_lclass = layout_support_get_lclass,
-               .enable = EINA_FALSE
+               .enable = EINA_TRUE
        },
        {
                .name = STR_INFOSQUARE,
@@ -94,13 +93,13 @@ static struct _menu_data _mdata[LAYOUT_MAX] = {
                .name = STR_VOICE,
                .layout_id = LAYOUT_ID_VOICE,
                .get_lclass = layout_voice_get_lclass,
-               .enable = EINA_FALSE
-       },*/
+               .enable = EINA_TRUE
+       },
 };
 
 static struct _menu_data *_mdata_p[LAYOUT_MAX] = {
-       &_mdata[0], &_mdata[1]/*, &_mdata[2], &_mdata[3],
-       &_mdata[4], &_mdata[5], &_mdata[6], &_mdata[7] */
+       &_mdata[0], &_mdata[1], &_mdata[2], &_mdata[3],
+       &_mdata[4], &_mdata[5], &_mdata[6], &_mdata[7]
 };
 
 static void _lock_focus_for_item(struct _priv *priv, int item, Eina_Bool lock);
@@ -248,9 +247,9 @@ static void _swap_menu_items(struct _priv *priv, int item1, int item2, Eina_Bool
 
        inputmgr_add_callback(priv->menu[item1], item1, &_menu_input_handler, priv);
        inputmgr_add_callback(priv->menu[item2], item2, &_menu_input_handler, priv);
-/*release changes:*/
-//settings_preferences_tab_order_set(item1, _mdata_p[item1]->layout_id);
-//settings_preferences_tab_order_set(item2, _mdata_p[item2]->layout_id);
+
+       settings_preferences_tab_order_set(item1, _mdata_p[item1]->layout_id);
+       settings_preferences_tab_order_set(item2, _mdata_p[item2]->layout_id);
 }
 
 static void _show_toast_message(Evas_Object *parent, char *text)
@@ -469,8 +468,8 @@ static Evas_Object *_create(Evas_Object *win, void *data)
                _ERR("Calloc failed.");
                return NULL;
        }
-/*release changes:*/
-//_tab_order_restore();
+
+       _tab_order_restore();
 
        priv->base = utils_add_layout(win, GRP_VIEW_BASE, EINA_TRUE);
        if (!priv->base) {