Fix nabi issue(35400, 35529, 35444, 35426, 35494, 35454)

Change-Id: I3653397e9caa78d72d211b30f9889aea65eb3b11
Signed-off-by: TaeHo Choi <thanks.choi@samsung.com>

diff --git a/inc/StMainMenuForm.h b/inc/StMainMenuForm.h
index 370795c..3cad29e 100644 (file)
--- a/inc/StMainMenuForm.h
+++ b/inc/StMainMenuForm.h
@@ -27,16 +27,16 @@
 #include <FSystem.h>
 #include "StBaseForm.h"
 
-//class IFlightModeSetValueAsyncResultListener
-//     : public Tizen::System::ISettingInfoSetValueAsyncResultListener
-//{
-//public:
-//     IFlightModeSetValueAsyncResultListener(void){}
-//     virtual ~IFlightModeSetValueAsyncResultListener(void){}
-//
-//private:
-//     virtual void OnResultReceivedForSetValueAsync(const Tizen::Base::String& key, result r);
-//};
+class IFlightModeSetValueAsyncResultListener
+       : public Tizen::System::ISettingInfoSetValueAsyncResultListener
+{
+public:
+       IFlightModeSetValueAsyncResultListener(void){}
+       virtual ~IFlightModeSetValueAsyncResultListener(void){}
+
+private:
+       virtual void OnResultReceivedForSetValueAsync(const Tizen::Base::String& key, result r);
+};
 
 class MainMenuForm
        : public BaseForm
@@ -74,6 +74,7 @@ public:
 
 private:
        void FindAppControlScene(int itemIndex);
+       void SetIFlightModeSetValueAsyncResultListener(void);
        const wchar_t* GroupConnectivitySceneConnect(int viewMode, int itemIndex, Tizen::Ui::Controls::TableViewItemStatus status);
        const wchar_t* GroupPersonalSceneConnect(int viewMode, int itemIndex, Tizen::Ui::Controls::TableViewItemStatus status);
        const wchar_t* GroupDeviceSceneConnect(int viewMode, int itemIndex, Tizen::Ui::Controls::TableViewItemStatus status);
@@ -83,6 +84,7 @@ private:
 private:
        int __currentTableViewList;
        bool __isEmulator;
+       Tizen::System::ISettingInfoSetValueAsyncResultListener* __pFlightModeSetValueAsyncResultListener;
 };
 
 #endif // _ST_MAIN_MENU_FORM_H_
\ No newline at end of file

diff --git a/inc/StPrivacyForm.h b/inc/StPrivacyForm.h
index 5f3258d..8736ab7 100644 (file)
--- a/inc/StPrivacyForm.h
+++ b/inc/StPrivacyForm.h
@@ -62,6 +62,7 @@ private:
        Tizen::Base::String GetDisplayPackageName(int itemIndex);
        Tizen::Base::String GetUsedPrivacyService(int itemIndex);
        void UpdateTableViewAndNoContent(void);
+       int GetPackageListCount(void);
 
 private:
        Tizen::Security::PrivacyManager* __pPrivacyManager;

diff --git a/src/StDateTimeForm.cpp b/src/StDateTimeForm.cpp
index 011524d..f390f90 100644 (file)
--- a/src/StDateTimeForm.cpp
+++ b/src/StDateTimeForm.cpp
@@ -67,7 +67,6 @@ static const int W_RESIZE_LABEL_GAP = 170;
 static const int H_TIME_FIELD = 150;
 
 static const int DIVIDE_BY_TWO = 2;
-static const int TIME_FIELD_GAP = 20;
 
 static const int SECOND_CONTROL_ITEM = 1;
 static const int SECOND_TEXT_ITEM = 2;
@@ -530,11 +529,12 @@ DateTimeForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                pEditDate->SetCurrentDate();
                pEditDate->SetYearRange(MIN_YEAR, MAX_YEAR);
                pEditDate->AddDateChangeEventListener(*this);
+               pEditDate->SetName(L"EditDate");
 
                pItem->AddControl(*pEditDate);
 
                EditTime* pEditTime = new (std::nothrow) EditTime();
-               pEditTime->Construct(Point(((itemWidth/DIVIDE_BY_TWO) + TIME_FIELD_GAP), 0), L" ");
+               pEditTime->Construct(Point(pEditDate->GetWidth(), 0), L" ");
                pEditTime->SetCurrentTime();
 
                if (SettingInfo::GetValue(SETTING_INFO_KEY_LOCALE_TIME_FORMAT_24HOUR, hourFormat) == E_SUCCESS)
@@ -878,6 +878,7 @@ DateTimeForm::UpdateItem(int groupIndex, int itemIndex, Tizen::Ui::Controls::Tab
 {
        if ((groupIndex == ID_GROUP_DATE_AND_TIME_LOCAL_TIME) && (itemIndex == ID_ITEM_DATE_AND_TIME_DATE_AND_TIME))
        {
+               EditDate* pEditDate = static_cast<EditDate*>(pItem->GetControl(L"EditDate"));
                EditTime* pEditTime = static_cast<EditTime*>(pItem->GetControl(L"EditTime"));
                if (pEditTime == null)
                {
@@ -890,7 +891,7 @@ DateTimeForm::UpdateItem(int groupIndex, int itemIndex, Tizen::Ui::Controls::Tab
                        pEditTime->Set24HourNotationEnabled(hourFormat);
                }
 
-               int pos = GetClientAreaBounds().width / DIVIDE_BY_TWO + TIME_FIELD_GAP;
+               int pos = pEditDate->GetWidth();
                pEditTime->SetPosition(pos, 0);
                pItem->Invalidate(true);
        }

diff --git a/src/StDeveloperOptionForm.cpp b/src/StDeveloperOptionForm.cpp
index 58aa224..349d97c 100644 (file)
--- a/src/StDeveloperOptionForm.cpp
+++ b/src/StDeveloperOptionForm.cpp
@@ -33,17 +33,17 @@ using namespace Tizen::Ui;
 using namespace Tizen::Ui::Controls;
 using namespace Tizen::Ui::Scenes;
 
-static const int ID_GROUP_DEVELOPER_GPU_RENDERING = 0;
+static const int ID_GROUP_DEVELOPER_USB_DEBUGGING = 0;
+static const int ID_GROUP_DEVELOPER_MAIN_ITEM_COUNT = 1;
+static const int ID_ITEM_DEVELOPER_USB_DEBUGGING = 0;
+
+static const int ID_GROUP_DEVELOPER_GPU_RENDERING = 1;
 static const int ID_GROUP_DEVELOPER_GPU_RENDERING_ITEM_COUNT = 1;
 static const int ID_ITEM_DEVELOPER_GPU_RENDERING = 0;
 
-static const int ID_GROUP_DEVELOPER_GPU_RENDERING_HELP = 1;
+static const int ID_GROUP_DEVELOPER_GPU_RENDERING_HELP = 2;
 static const int ID_GROUP_DEVELOPER_GPU_RENDERING_HELP_ITEM_COUNT = 0;
 
-static const int ID_GROUP_DEVELOPER_USB_DEBUGGING = 2;
-static const int ID_GROUP_DEVELOPER_MAIN_ITEM_COUNT = 1;
-static const int ID_ITEM_DEVELOPER_USB_DEBUGGING = 0;
-
 static const int ID_GROUP_DEVELOPER_CPU = 3;
 static const int ID_GROUP_DEVELOPER_CPU_ITEM_COUNT = 0;
 static const int ID_ITEM_DEVELOPER_CPU_USAGE = 0;
@@ -59,7 +59,7 @@ static const int ID_ITEM_DEVELOPER_LIMIT_PROCESS = 0;
 static const int IDA_USB_DEBUGGING_POPUP_OK = 100;
 static const int IDA_USB_DEBUGGING_POPUP_CANCEL = 200;
 
-static const int ID_GROUP_COUNT = 2;
+static const int ID_GROUP_COUNT = 3;
 static const int ID_GROUP_MAX_ITEM_COUNT = ID_GROUP_DEVELOPER_GPU_RENDERING_ITEM_COUNT;
 static const int H_HELP_TEXT_GAP = 3;
 static const int W_RESIZE_LABEL_GAP = 170;
@@ -78,6 +78,8 @@ static const int ALERT_POPUP_LABEL_FONT_SIZE = 40;
 static const int W_ALERT_POPUP_CLIENT_RECT_DEFAULT = 700;
 static const int H_ALERT_POPUP_CLIENT_RECT_DEFAULT = 550;
 
+static const int H_FONT_GAP = 20;
+
 DeveloperOptionForm::DeveloperOptionForm(void)
        : __isAppControlRequest(false)
        , __usbDebuggingPopup(null)
@@ -238,7 +240,7 @@ DeveloperOptionForm::CreateGroupItem(int groupIndex, int itemWidth)
                        style = LABEL_TEXT_STYLE_NORMAL;
                        yItemOffset = H_GROUP_INDEX_HELP_TEXT_TOP_GAP;
                        groupText = ResourceManager::GetString(L"IDS_ST_BODY_USE_2D_HARDWARE_ACCELERATION_IN_APPLICATIONS_ABB");
-                       itemHeight = GetHeightForStringArea(groupText, itemWidth, fontSize);
+                       itemHeight = GetHeightForStringArea(groupText, itemWidth, fontSize) + H_FONT_GAP;
                }
                break;
 
@@ -407,25 +409,17 @@ DeveloperOptionForm::OnGroupedTableViewItemStateChanged(Tizen::Ui::Controls::Gro
                                        itemSelectStatus = !itemSelectStatus;
                                }
 
-                               if (itemSelectStatus == true)
+                               result r = E_FAILURE;
+                               bool usbStatus = false;
+                               if ((r = SettingInfo::SetValue(SETTING_INFO_KEY_USB_DEBUGGING, usbStatus)) == E_SUCCESS)
                                {
-                                       status = TABLE_VIEW_ITEM_STATUS_UNCHECKED;
-                                       tableView.SetItemChecked(groupIndex, itemIndex, false);
-                                       CreateAlertPopup();
-                                       ShowAlertPopup();
+                                       __pTableView->SetItemChecked(ID_GROUP_DEVELOPER_USB_DEBUGGING, ID_ITEM_DEVELOPER_USB_DEBUGGING, usbStatus);
                                }
                                else
                                {
-                                       bool usbStatus = false;
-                                       if (SettingInfo::SetValue(SETTING_INFO_KEY_USB_DEBUGGING, usbStatus) == E_SUCCESS)
-                                       {
-                                               __pTableView->SetItemChecked(ID_GROUP_DEVELOPER_USB_DEBUGGING, ID_ITEM_DEVELOPER_USB_DEBUGGING, usbStatus);
-                                       }
-                                       else
-                                       {
-                                               __pTableView->SetItemChecked(ID_GROUP_DEVELOPER_USB_DEBUGGING, ID_ITEM_DEVELOPER_USB_DEBUGGING, true);
-                                               ShowMessageBox(ResourceManager::GetString(L"IDS_EMAIL_POP_ALERT"), ResourceManager::GetString(L"IDS_ST_POP_NOT_SUPPORTED"));
-                                       }
+                                       AppLogDebug("result[%s]", GetErrorMessage(r));
+                                       __pTableView->SetItemChecked(ID_GROUP_DEVELOPER_USB_DEBUGGING, ID_ITEM_DEVELOPER_USB_DEBUGGING, true);
+                                       ShowMessageBox(ResourceManager::GetString(L"IDS_EMAIL_POP_ALERT"), ResourceManager::GetString(L"IDS_ST_POP_NOT_SUPPORTED"));
                                }
                        }
                }

diff --git a/src/StDisplayForm.cpp b/src/StDisplayForm.cpp
index 77c6b3b..42da8f3 100644 (file)
--- a/src/StDisplayForm.cpp
+++ b/src/StDisplayForm.cpp
@@ -111,6 +111,10 @@ DisplayForm::OnTerminating(void)
 void
 DisplayForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousSceneId, const Tizen::Ui::Scenes::SceneId& currentSceneId, Tizen::Base::Collection::IList* pArgs)
 {
+       if (previousSceneId == IDSCN_FONT)
+       {
+               return;
+       }
        __pTableView->UpdateTableView();
 
        bool autoRotation = false;

diff --git a/src/StFontSizeForm.cpp b/src/StFontSizeForm.cpp
index e8b30fd..82375ad 100644 (file)
--- a/src/StFontSizeForm.cpp
+++ b/src/StFontSizeForm.cpp
@@ -345,7 +345,7 @@ FontSizeForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
        RelativeLayout relativeLayout;
        relativeLayout.Construct();
 
-       pItem->Construct(relativeLayout, Dimension(itemWidth, H_GROUP_ITEM_DEFAULT), style);
+       pItem->Construct(relativeLayout, Dimension(itemWidth, itemRectangle.height), style);
        pItem->SetBackgroundColor(COLOR_BG_GROUP_ITEM_DEFAULT);
 
        pLabel = new (std::nothrow) Label();

diff --git a/src/StLocationHelpForm.cpp b/src/StLocationHelpForm.cpp
index 09dbd76..87ab766 100644 (file)
--- a/src/StLocationHelpForm.cpp
+++ b/src/StLocationHelpForm.cpp
@@ -31,10 +31,9 @@ using namespace Tizen::Ui::Scenes;
 
 static const int XYH_BASE_POINT = 0;
 
-static const int ID_ITEM_COUNT = 3;
+static const int ID_ITEM_COUNT = 2;
 static const int ID_HELP_TEXT_GPS = 0;
-static const int ID_HELP_TEXT_ADVANCED_GPS = 1;
-static const int ID_HELP_TEXT_NETWORK_POSITION = 2;
+static const int ID_HELP_TEXT_NETWORK_POSITION = 1;
 
 LocationHelpForm::LocationHelpForm(void)
 {
@@ -99,13 +98,6 @@ LocationHelpForm::CreateHelpText(const Rectangle& bounds)
                        }
                        break;
 
-               case ID_HELP_TEXT_ADVANCED_GPS:
-                       {
-                               itemTitle = ResourceManager::GetString(L"IDS_ST_BODY_ADVANCED_GPS");
-                               itemHelp = ResourceManager::GetString(L"IDS_LBS_BODY_DOWNLOADING_DATA_WILL_SPEED_UP_GPS_OPERATION_BUT_INCUR_CHARGES");
-                       }
-                       break;
-
                case ID_HELP_TEXT_NETWORK_POSITION:
                        {
                                itemTitle = ResourceManager::GetString(L"IDS_LBS_BODY_NETWORK_POSITION");

diff --git a/src/StMainMenuForm.cpp b/src/StMainMenuForm.cpp
index 51e3918..00700c4 100644 (file)
--- a/src/StMainMenuForm.cpp
+++ b/src/StMainMenuForm.cpp
@@ -36,6 +36,8 @@ using namespace Tizen::Ui;
 using namespace Tizen::Ui::Controls;
 using namespace Tizen::Ui::Scenes;
 
+static const int W_RESIZE_LABEL_GAP = 110;
+
 static const int H_GROUP_FONT_SIZE_GIANT = 146;
 static const int H_GROUP_FONT_SIZE_HUGE = 128;
 static const int H_GROUP_FONT_SIZE_LARGE = 110;
@@ -54,14 +56,18 @@ static const int ID_ITEM_CONNECTIVITY_NETWORK = 2;
 static const int ID_ITEM_CONNECTIVITY_NFC = 3;
 static const int ID_GROUP_CONNECTIVITY_ITEM_COUNT = 4;
 
-static const int ID_GROUP_PERSONAL = 1;
+static const int ID_GROUP_MODE = 1;
+static const int ID_ITEM_MODE_FLIGHT_MODE = 0;
+static const int ID_GROUP_MODE_ITEM_COUNT = 1;
+
+static const int ID_GROUP_PERSONAL = 2;
 static const int ID_ITEM_PERSONAL_HOME_SCREEN = 0;
 static const int ID_ITEM_PERSONAL_LOCK_SCREEN = 1;
 static const int ID_ITEM_PERSONAL_ACCOUNTS = 2;
 static const int ID_ITEM_PERSONAL_PRIVACY = 3;
 static const int ID_GROUP_PERSONAL_ITEM_COUNT = 4;
 
-static const int ID_GROUP_DEVICE = 2;
+static const int ID_GROUP_DEVICE = 3;
 static const int ID_ITEM_DEVICE_DISPLAY = 0;
 static const int ID_ITEM_DEVICE_SOUND = 1;
 static const int ID_ITEM_DEVICE_LOCATION = 2;
@@ -71,7 +77,7 @@ static const int ID_ITEM_DEVICE_DATE_TIME = 4;
 static const int ID_ITEM_DEVICE_LANGUAGE_KEYBOARD = 5;
 static const int ID_GROUP_DEVICE_ITEM_COUNT = 6;
 
-static const int ID_GROUP_SYSTEM = 3;
+static const int ID_GROUP_SYSTEM = 4;
 static const int ID_ITEM_SYSTEM_MANAGE_APPLICATION = 0;
 static const int ID_ITEM_SYSTEM_DOWNLOADED_APPLICATION = 1;
 static const int ID_ITEM_SYSTEM_DEVELOPER_OPTION = 2;
@@ -79,12 +85,20 @@ static const int ID_ITEM_SYSTEM_ABOUT_PHONE = 3;
 static const int ID_GROUP_SYSTEM_ITEM_COUNT = 3;
 static const int ID_GROUP_SYSTEM_DEVICE_ITEM_COUNT = 4;
 
-static const int ID_GROUP_APPSETTING = 4;
+static const int ID_GROUP_APPSETTING = 5;
 static const int ID_GROUP_NO_APPSETTING = 4;
 static const int ID_MAIN_MENU_DEFAULT_COUNT = 1;
+static const int EMULATOR_DEFAULT_COUNT = 1;
+
+void
+IFlightModeSetValueAsyncResultListener::OnResultReceivedForSetValueAsync(const Tizen::Base::String& key, result r)
+{
+       AppLogDebug("key(%ls) r(%s)", key.GetPointer(), GetErrorMessage(r));
+}
 
 MainMenuForm::MainMenuForm(void)
        : __currentTableViewList(0)
+       , __pFlightModeSetValueAsyncResultListener(null)
 {
 }
 
@@ -130,6 +144,12 @@ MainMenuForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousSceneI
        pHeader->SetTitleText(ResourceManager::GetString(L"IDS_COM_BODY_SETTINGS"));
 
        __pTableView->UpdateTableView();
+
+       bool flightModeEnableStatus = false;
+       if (SettingInfo::GetValue(SETTING_INFO_KEY_NETWORK_FLIGHTMODE, flightModeEnableStatus) == E_SUCCESS)
+       {
+               __pTableView->SetItemChecked(ID_GROUP_MODE, ID_ITEM_MODE_FLIGHT_MODE, flightModeEnableStatus);
+       }
 }
 
 void
@@ -142,6 +162,11 @@ MainMenuForm::GetGroupCount(void)
 {
        int groupItemCount = ID_GROUP_NO_APPSETTING;
 
+       if (__isEmulator == false)
+       {
+               groupItemCount += ID_MAIN_MENU_DEFAULT_COUNT;
+       }
+
        return groupItemCount;
 }
 
@@ -150,6 +175,12 @@ MainMenuForm::GetItemCount(int groupIndex)
 {
        AppLogDebug("ENTER");
 
+       if ((__isEmulator == true)
+               && (groupIndex >= ID_GROUP_MODE))
+       {
+               groupIndex += EMULATOR_DEFAULT_COUNT;
+       }
+
        int itemCount = 0;
 
        switch (groupIndex)
@@ -160,11 +191,11 @@ MainMenuForm::GetItemCount(int groupIndex)
                }
                break;
 
-//     case ID_GROUP_MODE:
-//             {
-//                     itemCount = ID_GROUP_MODE_ITEM_COUNT;
-//             }
-//             break;
+       case ID_GROUP_MODE:
+               {
+                       itemCount = ID_GROUP_MODE_ITEM_COUNT;
+               }
+               break;
 
        case ID_GROUP_DEVICE:
                {
@@ -216,6 +247,12 @@ MainMenuForm::CreateGroupItem(int groupIndex, int itemWidth)
        Label* pLabel = null;
        int fontSize = GetFontSize();
 
+       if ((__isEmulator == true)
+               && (groupIndex >= ID_GROUP_MODE))
+       {
+               groupIndex += EMULATOR_DEFAULT_COUNT;
+       }
+
        switch (groupIndex)
        {
        case ID_GROUP_CONNECTIVITY:
@@ -224,11 +261,11 @@ MainMenuForm::CreateGroupItem(int groupIndex, int itemWidth)
                }
                break;
 
-//     case ID_GROUP_MODE:
-//             {
-//                     groupText = ResourceManager::GetString(L"IDS_ST_BODY_MODE");
-//             }
-//             break;
+       case ID_GROUP_MODE:
+               {
+                       groupText = ResourceManager::GetString(L"IDS_ST_BODY_MODE");
+               }
+               break;
 
        case ID_GROUP_PERSONAL:
                {
@@ -308,6 +345,12 @@ MainMenuForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
 {
        AppLogDebug("group[%d] item[%d]", groupIndex, itemIndex);
 
+       if ((__isEmulator == true)
+               && (groupIndex >= ID_GROUP_MODE))
+       {
+               groupIndex += EMULATOR_DEFAULT_COUNT;
+       }
+
        int fontSize = GetFontSize();
 
        unsigned int itemHeight = 0;
@@ -321,8 +364,8 @@ MainMenuForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
        Bitmap* pBitmap = null;
        Label* pLabel = null;
 
-       itemHeight = H_GROUP_ITEM_DEFAULT_LABEL;
        ItemTypeIconAndOneLine(itemRectIcon, itemRectLabel);
+       itemHeight = itemRectLabel.height;
 
        switch (groupIndex)
        {
@@ -374,14 +417,14 @@ MainMenuForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                }
                break;
 
-//     case ID_GROUP_MODE:
-//             {
-//                     style = TABLE_VIEW_ANNEX_STYLE_ONOFF_SLIDING;
-//                     itemRectLabel.width -= W_RESIZE_LABEL_GAP;
-//                     pBitmap = ResourceManager::GetBitmapN(IDB_FLIGHT_MODE);
-//                     itemText = ResourceManager::GetString(L"IDS_ST_BODY_FLIGHT_MODE");
-//             }
-//             break;
+       case ID_GROUP_MODE:
+               {
+                       style = TABLE_VIEW_ANNEX_STYLE_ONOFF_SLIDING;
+                       itemRectLabel.width -= W_RESIZE_LABEL_GAP;
+                       pBitmap = ResourceManager::GetBitmapN(IDB_FLIGHT_MODE);
+                       itemText = ResourceManager::GetString(L"IDS_ST_BODY_FLIGHT_MODE");
+               }
+               break;
 
        case ID_GROUP_PERSONAL:
                {
@@ -558,7 +601,14 @@ MainMenuForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                pLabel->SetTextColor(COLOR_MAIN_TEXT);
 
                pItem->AddControl(*pLabel);
-               relativeLayout.SetMargin(*pLabel, itemRectLabel.x, MAIN_RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
+               if (style == TABLE_VIEW_ANNEX_STYLE_ONOFF_SLIDING)
+               {
+                       relativeLayout.SetMargin(*pLabel, itemRectLabel.x, RELATIVE_LAYOUT_RIGHT_MARGIN_ONOFF_SLIDING, 0, 0);
+               }
+               else
+               {
+                       relativeLayout.SetMargin(*pLabel, itemRectLabel.x, MAIN_RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
+               }
                relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
                relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);
        }
@@ -594,6 +644,11 @@ MainMenuForm::OnGroupedTableViewItemStateChanged(Tizen::Ui::Controls::GroupedTab
        SceneManager* pSceneManager = SceneManager::GetInstance();
        AppAssert(pSceneManager);
 
+       if ((__isEmulator == true)
+               && (groupIndex >= ID_GROUP_MODE))
+       {
+               groupIndex += EMULATOR_DEFAULT_COUNT;
+       }
        ArrayList* pArgs = null;
        const wchar_t* pSceneName = null;
 
@@ -624,29 +679,29 @@ MainMenuForm::OnGroupedTableViewItemStateChanged(Tizen::Ui::Controls::GroupedTab
                }
                break;
 
-//     case ID_GROUP_MODE:
-//             {
-//                     if (itemIndex == ID_ITEM_MODE_FLIGHT_MODE)
-//                     {
-//                             bool flightModeStatus = tableView.IsItemChecked(groupIndex, itemIndex);
-//                             if (status == TABLE_VIEW_ITEM_STATUS_SELECTED)
-//                             {
-//                                     flightModeStatus = (!(flightModeStatus));
-//                             }
-//
-//                             SetIFlightModeSetValueAsyncResultListener();
-//                             if (SettingInfo::SetValueAsyncForPrivilegedKey(SETTING_INFO_KEY_NETWORK_FLIGHTMODE, flightModeStatus, __pFlightModeSetValueAsyncResultListener) == E_SUCCESS)
-//                             {
-//                                     tableView.SetItemChecked(groupIndex, itemIndex, flightModeStatus);
-//                                     AppLogDebug("flightmode(%d) GetLastResult(%s)", flightModeStatus, GetErrorMessage(GetLastResult()));
-//                             }
-//                             else
-//                             {
-//                                     AppLogDebug("flightmode(%d) GetLastResult(%s)", flightModeStatus, GetErrorMessage(GetLastResult()));
-//                             }
-//                     }
-//             }
-//             break;
+       case ID_GROUP_MODE:
+               {
+                       if (itemIndex == ID_ITEM_MODE_FLIGHT_MODE)
+                       {
+                               bool flightModeStatus = tableView.IsItemChecked(groupIndex, itemIndex);
+                               if (status == TABLE_VIEW_ITEM_STATUS_SELECTED)
+                               {
+                                       flightModeStatus = (!(flightModeStatus));
+                               }
+
+                               SetIFlightModeSetValueAsyncResultListener();
+                               if (SettingInfo::SetValueAsyncForPrivilegedKey(SETTING_INFO_KEY_NETWORK_FLIGHTMODE, flightModeStatus, __pFlightModeSetValueAsyncResultListener) == E_SUCCESS)
+                               {
+                                       tableView.SetItemChecked(groupIndex, itemIndex, flightModeStatus);
+                                       AppLogDebug("flightmode(%d) GetLastResult(%s)", flightModeStatus, GetErrorMessage(GetLastResult()));
+                               }
+                               else
+                               {
+                                       AppLogDebug("flightmode(%d) GetLastResult(%s)", flightModeStatus, GetErrorMessage(GetLastResult()));
+                               }
+                       }
+               }
+               break;
 
        case ID_GROUP_PERSONAL:
                {
@@ -1003,6 +1058,12 @@ MainMenuForm::OnResultReceivedForSetValueAsync(const Tizen::Base::String& key, r
 }
 
 void
+MainMenuForm::SetIFlightModeSetValueAsyncResultListener(void)
+{
+       __pFlightModeSetValueAsyncResultListener = new (std::nothrow) IFlightModeSetValueAsyncResultListener();
+}
+
+void
 MainMenuForm::OnOrientationChanged(const Tizen::Ui::Control& source, Tizen::Ui::OrientationStatus orientationStatus)
 {
        Invalidate(true);

diff --git a/src/StManageApplicationInfoForm.cpp b/src/StManageApplicationInfoForm.cpp
index 74fd7b5..883baa6 100644 (file)
--- a/src/StManageApplicationInfoForm.cpp
+++ b/src/StManageApplicationInfoForm.cpp
@@ -468,8 +468,6 @@ ManageApplicationInfoForm::CreateItem(int groupIndex, int itemIndex, int itemWid
 
        RelativeLayout relativeLayout;
        relativeLayout.Construct();
-       pItem->Construct(Dimension(itemWidth, itemHeight), style);
-       pItem->SetBackgroundColor(COLOR_BG_GROUP_ITEM_DEFAULT);
 
        if (isCommandButton == true)
        {
@@ -521,6 +519,9 @@ ManageApplicationInfoForm::CreateItem(int groupIndex, int itemIndex, int itemWid
        }
        else
        {
+               pItem->Construct(Dimension(itemWidth, itemHeight), style);
+               pItem->SetBackgroundColor(COLOR_BG_GROUP_ITEM_DEFAULT);
+
                if (isBitmapSet == true)
                {
                        pBitmapLabel = new (std::nothrow) Label();

diff --git a/src/StPrivacyForm.cpp b/src/StPrivacyForm.cpp
index e3b3791..a10f59f 100644 (file)
--- a/src/StPrivacyForm.cpp
+++ b/src/StPrivacyForm.cpp
@@ -245,10 +245,7 @@ PrivacyForm::GetItemCount(int groupIndex)
 {
        int itemCount = 0;
 
-       if (__privacyPackageList)
-       {
-               itemCount = __privacyPackageList->GetCount();
-       }
+       itemCount = GetPackageListCount();
        AppLogDebug("GetItemCount %d", itemCount);
 
        return itemCount;
@@ -440,13 +437,25 @@ PrivacyForm::OnGroupedTableViewGroupItemStateChanged(Tizen::Ui::Controls::Groupe
 {
 }
 
+int
+PrivacyForm::GetPackageListCount(void)
+{
+       if (__privacyPackageList == null)
+       {
+               AppLogDebug("__privacyPackageList is null");
+               return 0;
+       }
+
+       return __privacyPackageList->GetCount();
+}
+
 void
 PrivacyForm::UpdateTableViewAndNoContent(void)
 {
        bool createTableView = false;
        if (__pTableView != null)
        {
-               if (__privacyPackageList != null)
+               if (GetPackageListCount() != 0)
                {
                        __pTableView->UpdateTableView();
                        return;
@@ -454,7 +463,7 @@ PrivacyForm::UpdateTableViewAndNoContent(void)
        }
        else
        {
-               if (__privacyPackageList != null)
+               if (GetPackageListCount() != 0)
                {
                        createTableView = true;
                }