Add Account menu and change detail arrow button image and fix display error about...
authorTaeHo Choi <thanks.choi@samsung.com>
Mon, 18 Mar 2013 07:53:30 +0000 (16:53 +0900)
committerTaeHo Choi <thanks.choi@samsung.com>
Mon, 18 Mar 2013 07:53:30 +0000 (16:53 +0900)
Change-Id: I07c046b3512ac15349739883918cd9b114bae24c
Signed-off-by: TaeHo Choi <thanks.choi@samsung.com>
21 files changed:
inc/StAboutPhoneForm.h
inc/StAppSettingForm.h
inc/StSoundsForm.h
inc/StTypes.h
res/screen-density-xhigh/00_button_expand_closed.png [new file with mode: 0644]
res/screen-density-xhigh/00_button_expand_opened.png [new file with mode: 0644]
src/StAboutPhoneForm.cpp
src/StAppSettingForm.cpp
src/StBluetoothForm.cpp
src/StDateTimeForm.cpp
src/StFontForm.cpp
src/StKeyboardForm.cpp
src/StLocationForm.cpp
src/StMainMenuForm.cpp
src/StMemoryForm.cpp
src/StMemoryStatusForm.cpp
src/StMoreConnectivityForm.cpp
src/StMoreSystemForm.cpp
src/StNetworkForm.cpp
src/StSoundsForm.cpp
src/StTypes.cpp

index 4c5e87f..ecf487d 100644 (file)
@@ -80,7 +80,6 @@ public:
 
        virtual void OnBatteryLevelChangedInPercentage(int percentage);
        virtual void OnChargingStateChanged(bool charging);
-       virtual void OnActionPerformed(const Tizen::Ui::Control& source, int actionId);
 
        virtual void OnWifiActivated(result r){}
        virtual void OnWifiConnected(const Tizen::Base::String& ssid, result r){}
@@ -91,8 +90,8 @@ public:
 
        virtual void OnKeypadActionPerformed(Tizen::Ui::Control& source, Tizen::Ui::KeypadAction keypadAction);
        virtual void OnKeypadClosed(Tizen::Ui::Control& source);
-       virtual void OnKeypadOpened(Tizen::Ui::Control& source);
-       virtual void OnKeypadWillOpen(Tizen::Ui::Control& source);
+       virtual void OnKeypadOpened(Tizen::Ui::Control& source){}
+       virtual void OnKeypadWillOpen(Tizen::Ui::Control& source){}
        virtual void OnKeypadBoundsChanged(Tizen::Ui::Control& source){}
 
        virtual void OnUserEventReceivedN(RequestId requestId, Tizen::Base::Collection::IList* pArgs);
index 268410d..c03a14d 100644 (file)
@@ -78,7 +78,7 @@ public:
        virtual void OnKeypadActionPerformed(Tizen::Ui::Control& source, Tizen::Ui::KeypadAction keypadAction);
        virtual void OnKeypadClosed(Tizen::Ui::Control& source);
        virtual void OnKeypadOpened(Tizen::Ui::Control& source);
-       virtual void OnKeypadWillOpen(Tizen::Ui::Control& source);
+       virtual void OnKeypadWillOpen(Tizen::Ui::Control& source){}
        virtual void OnKeypadBoundsChanged(Tizen::Ui::Control& source){}
 
        virtual void OnOrientationChanged(const Tizen::Ui::Control& source, Tizen::Ui::OrientationStatus orientationStatus);
@@ -108,7 +108,8 @@ private:
        void SetHeaderTitle(void);
        void ReSizingTableviewForClipboard(int scrollToGroupIndex = 0, int scrollToItemIndex = 0, bool isSetScrollPosition = false);
        void CreateNoContents(void);
-       void RefreshItemList(int groupIndex);
+       void RefreshExpandListItem(int groupIndex);
+
 private:
        Tizen::Base::String __filePath;
        Tizen::Base::String __appId;
index 96eacda..f186743 100644 (file)
@@ -64,7 +64,7 @@ public:
        virtual void OnActionPerformed(const Tizen::Ui::Control& source, int actionId);
 
        virtual void OnAdjustmentValueChanged(const Tizen::Ui::Control& source, int adjustment);
-       virtual void OnSliderBarMoved(Tizen::Ui::Controls::Slider& source, int value);
+       virtual void OnSliderBarMoved(Tizen::Ui::Controls::Slider& source, int value){}
 
 private:
        int __currentTableViewList;
index ed92c32..c0a46c1 100644 (file)
@@ -173,7 +173,9 @@ extern const int TWO_LINE_ITEM_WIDTH_GAP;
 extern const int ICON_AND_ONE_LINE_ITEM_WIDTH_GAP;
 
 extern const int RELATIVE_LAYOUT_RIGHT_MARGIN;
+extern const int RELATIVE_LAYOUT_RIGHT_MARGIN_DETAIL_ARROW_BUTTON;
 extern const int RELATIVE_LAYOUT_LEFT_MARGIN;
+extern const int W_DETAIL_ARROW_BUTTON;
 
 extern const int FRFRESH_REQUEST_EVENT;
 
@@ -267,6 +269,8 @@ extern const wchar_t* IDB_WIFI_RSSI_UNLOCK_00;
 extern const wchar_t* IDB_WIFI_RSSI_UNLOCK_01;
 extern const wchar_t* IDB_WIFI_RSSI_UNLOCK_02;
 extern const wchar_t* IDB_WIFI_RSSI_UNLOCK_03;
+extern const wchar_t* IDB_DETAIL_BUTTON_EXPAND_OPENED;
+extern const wchar_t* IDB_DETAIL_BUTTON_EXPAND_CLOSED;
 
 //ETC not using now.
 extern const wchar_t* IDB_POWER_SAVING_MODE;
diff --git a/res/screen-density-xhigh/00_button_expand_closed.png b/res/screen-density-xhigh/00_button_expand_closed.png
new file mode 100644 (file)
index 0000000..0c3ea19
Binary files /dev/null and b/res/screen-density-xhigh/00_button_expand_closed.png differ
diff --git a/res/screen-density-xhigh/00_button_expand_opened.png b/res/screen-density-xhigh/00_button_expand_opened.png
new file mode 100644 (file)
index 0000000..848edcc
Binary files /dev/null and b/res/screen-density-xhigh/00_button_expand_opened.png differ
index 55c823f..0bf9ad4 100644 (file)
@@ -409,7 +409,6 @@ PhoneInfoForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                                int cpuUsage = 0;
                                SetICpuUsageResultListener();
 
-                       //      if (RuntimeInfo::GetValue(RUNTIME_INFO_KEY_CPU_USAGE, cpuUsage) == E_SUCCESS)
                                if (RuntimeInfo::GetValueAsync(RUNTIME_INFO_KEY_CPU_USAGE, __CpuUsageGetInfoResultListener))
                                {
                                        itemTextTwoLine = Integer::ToString(cpuUsage);
@@ -455,8 +454,6 @@ PhoneInfoForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                __pEditField->SetColor(EDIT_STATUS_PRESSED, COLOR_BG_GROUP_INDEX_DEFAULT);
                __pEditField->SetColor(EDIT_STATUS_HIGHLIGHTED, COLOR_BG_GROUP_INDEX_DEFAULT);
 
-               __pEditField->SetOverlayKeypadCommandButtonVisible(false);
-
                __pEditField->AddActionEventListener(*this);
                __pEditField->AddKeypadEventListener(*this);
 
@@ -545,50 +542,18 @@ PhoneInfoForm::OnChargingStateChanged(bool charging)
 }
 
 void
-PhoneInfoForm::OnActionPerformed(const Control& source, int actionId)
-{
-       AppLogDebug("ActionId [%d]", actionId);
-
-       switch (actionId)
-       {
-       case IDA_HEADER_BACK_BUTTON:
-               {
-                       __pEditField->HideKeypad();
-                       __pEditField->Invalidate(false);
-               }
-               break;
-
-       default:
-               break;
-       }
-}
-
-void
 PhoneInfoForm::OnGroupedTableViewItemStateChanged(Tizen::Ui::Controls::GroupedTableView& tableView, int groupIndex, int itemIndex, Tizen::Ui::Controls::TableViewItem* pItem, Tizen::Ui::Controls::TableViewItemStatus status)
 {
-       Header* pHeader = GetHeader();
-       HeaderStyle headerStyle = pHeader->GetStyle();
-
-       if (headerStyle == HEADER_STYLE_BUTTON)
+       if (__pEditField != null)
        {
                __pEditField->HideKeypad();
                __pEditField->Invalidate(false);
-
-               pHeader->SetStyle(HEADER_STYLE_TITLE);
-               pHeader->SetTitleText(ResourceManager::GetString(L"IDS_ST_BODY_ABOUT_PHONE"));
-               Invalidate(true);
        }
 
        switch (groupIndex)
        {
        case ID_GROUP_ABOUT_PHONE_CERTIFICATE:
                {
-                       if (__pEditField != null)
-                       {
-                               __pEditField->HideKeypad();
-                               __pEditField->Invalidate(false);
-                       }
-
                        SceneManager* pSceneManager = SceneManager::GetInstance();
                        AppAssert(pSceneManager);
 
@@ -597,9 +562,11 @@ PhoneInfoForm::OnGroupedTableViewItemStateChanged(Tizen::Ui::Controls::GroupedTa
                break;
 
        default:
+               {
+                       SetFocus();
+               }
                break;
        }
-       SetFocus();
 }
 
 int
@@ -667,42 +634,9 @@ PhoneInfoForm::OnGroupedTableViewGroupItemStateChanged(Tizen::Ui::Controls::Grou
 }
 
 void
-PhoneInfoForm::OnKeypadWillOpen(Tizen::Ui::Control& source)
-{
-       Header* pHeader = GetHeader();
-       Bitmap* pBitmapNormal = ResourceManager::GetBitmapN(IDB_HEADER_BACK_BUTTON_NORMAL);
-       Bitmap* pBitmapPress = ResourceManager::GetBitmapN(IDB_HEADER_BACK_BUTTON_PRESS);
-
-       ButtonItem buttonItem;
-       buttonItem.Construct(BUTTON_ITEM_STYLE_ICON, IDA_HEADER_BACK_BUTTON);
-       buttonItem.SetIcon(BUTTON_ITEM_STATUS_NORMAL, pBitmapNormal);
-       buttonItem.SetIcon(BUTTON_ITEM_STATUS_PRESSED, pBitmapPress);
-
-       pHeader->SetButton(BUTTON_POSITION_RIGHT, buttonItem);
-       pHeader->AddActionEventListener(*this);
-       pHeader->Invalidate(false);
-
-       SetActionBarsVisible(FORM_ACTION_BAR_FOOTER, false);
-
-       delete pBitmapNormal;
-       delete pBitmapPress;
-}
-
-void
-PhoneInfoForm::OnKeypadOpened(Tizen::Ui::Control& source)
-{
-       Invalidate(true);
-}
-
-void
 PhoneInfoForm::OnKeypadClosed(Tizen::Ui::Control& source)
 {
-       Header* pHeader = GetHeader();
-       pHeader->SetStyle(HEADER_STYLE_TITLE);
-       pHeader->SetTitleText(ResourceManager::GetString(L"IDS_ST_BODY_ABOUT_PHONE"));
-
-       SetActionBarsVisible(FORM_ACTION_BAR_FOOTER, true);
-       Invalidate(true);
+       SetFocus();
 }
 
 void
index 1f0cf35..7d75211 100644 (file)
@@ -1069,10 +1069,11 @@ AppSettingForm::CreateGroupItem(int groupIndex, int itemWidth)
        Rectangle itemRectangle;
        String* groupText = null;
        Node* pNode = null;
-       __pGroupItemNodeList->GetAt(groupIndex, pNode);
        Label* pLabel = null;
        TableViewGroupItem* pItem = new (std::nothrow) TableViewGroupItem();
 
+       __pGroupItemNodeList->GetAt(groupIndex, pNode);
+
        itemRectangle.x = X_GROUP_ITEM_DEFAULT_LABEL;
        itemRectangle.y = yItemOffset;
        itemRectangle.width = itemWidth;
@@ -1112,14 +1113,12 @@ AppSettingForm::CreateGroupItem(int groupIndex, int itemWidth)
                itemHeight = itemRectangle.height;
        }
 
-
        if ((pNode->GetType()).Equals(ID_APPSETTING_ITEM_TYPE_EXPAND_LIST, false))
        {
                String* value = pNode->GetAttributeN(ID_APPSETTING_ATTRIBUTE_TYPE_VALUE);
                String expendList;
 
-               AppLogDebug("groupText [%ls]", groupText->GetPointer());
-               AppLogDebug("value [%ls]", value->GetPointer());
+               AppLogDebug("groupText [%ls] value [%ls]", groupText->GetPointer(), value->GetPointer());
 
                pNode->RegisterObserverlistener(__pIOAppSetting);
 
@@ -1320,7 +1319,6 @@ AppSettingForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                pEditField->AddActionEventListener(*this);
                pEditField->AddTextEventListener(*this);
                pEditField->SetName(id);
-               pEditField->SetOverlayKeypadCommandButtonVisible(false);
                pEditField->AddKeypadEventListener(*this);
 
                pItem->AddControl(*pEditField);
@@ -1504,7 +1502,7 @@ AppSettingForm::OnGroupedTableViewItemStateChanged(Tizen::Ui::Controls::GroupedT
                                }
                                __pTableView->SetItemChecked(groupIndex, count, itemSelectStatus);
                        }
-                       RefreshItemList(groupIndex);
+                       RefreshExpandListItem(groupIndex);
 
                        Invalidate(true);
                        return;
@@ -1599,7 +1597,7 @@ AppSettingForm::GetDefaultItemHeight(void)
 }
 
 void
-AppSettingForm::RefreshItemList(int groupIndex)
+AppSettingForm::RefreshExpandListItem(int groupIndex)
 {
        int itemCount = __pTableView->GetItemCountAt(groupIndex);
 
@@ -1615,7 +1613,7 @@ AppSettingForm::UpdateGroupItem(int groupIndex, Tizen::Ui::Controls::TableViewGr
        Node* pNode = null;
        __pGroupItemNodeList->GetAt(groupIndex, pNode);
 
-       if (pNode->GetType().Equals("expandlist",false))
+       if (pNode->GetType().Equals(ID_APPSETTING_ITEM_TYPE_EXPAND_LIST, false))
        {
                Label* pLabel = static_cast<Label*>(pItem->GetControl(0));
                String expandList;
@@ -1627,7 +1625,7 @@ AppSettingForm::UpdateGroupItem(int groupIndex, Tizen::Ui::Controls::TableViewGr
                expandList.Append(L" : ");
                expandList.Append(value->GetPointer());
 
-               AppLogTag("hwkim", "itemChanged [%ls]", expandList.GetPointer());
+               AppLogDebug("itemChanged [%ls]", expandList.GetPointer());
                pLabel->SetText(expandList);
                pLabel->Invalidate(false);
                delete groupText;
@@ -1648,11 +1646,9 @@ AppSettingForm::UpdateItem(int groupIndex, int itemIndex, Tizen::Ui::Controls::T
 
        if (!pItemNode->GetType().Equals(ID_APPSETTING_ITEM_TYPE_EXPAND_LIST, false))
        {
-               AppLogDebug("pItemNode->GetType not equal ID_APPSETTING_ITEM_TYPE_EXPAND_LIST [%ls]", pItemNode->GetType().GetPointer());
-
                if (pItemNode->GetType().Equals(ID_APPSETTING_ITEM_TYPE_EXPAND_ITEM, false))
                {
-                       AppLogDebug("here [%ls]", pItemNode->GetType().GetPointer());
+                       AppLogDebug("pItemNode->GetType not equal ID_APPSETTING_ITEM_TYPE_EXPAND_LIST [%ls]", pItemNode->GetType().GetPointer());
                        pItem->Invalidate(false);
                }
                return;
@@ -1751,101 +1747,16 @@ AppSettingForm::OnTextValueChanged(const Tizen::Ui::Control& source)
 }
 
 void
-AppSettingForm::OnKeypadWillOpen(Tizen::Ui::Control& source)
-{
-       __pStaticEdit = static_cast<EditField*>(&const_cast<Control&>(source));
-
-       String sourceName = source.GetName();
-       Node* pNode = GetItemHashCodeMap(sourceName.GetHashCode());
-       if (pNode == null)
-       {
-               AppLogDebug("pNode is null");
-               return;
-       }
-
-       if (pNode->GetType().Equals(ID_APPSETTING_ITEM_TYPE_STRING, false))
-       {
-               String id = pNode->GetId();
-
-               Header* pHeader = GetHeader();
-               Bitmap* pBitmapNormal = ResourceManager::GetBitmapN(IDB_HEADER_BACK_BUTTON_NORMAL);
-               Bitmap* pBitmapPress = ResourceManager::GetBitmapN(IDB_HEADER_BACK_BUTTON_PRESS);
-
-               ButtonItem buttonItem;
-               buttonItem.Construct(BUTTON_ITEM_STYLE_ICON, IDA_HEADER_BACK_BUTTON);
-               buttonItem.SetIcon(BUTTON_ITEM_STATUS_NORMAL, pBitmapNormal);
-               buttonItem.SetIcon(BUTTON_ITEM_STATUS_PRESSED, pBitmapPress);
-
-               pHeader->SetButton(BUTTON_POSITION_RIGHT, buttonItem);
-               pHeader->AddActionEventListener(*this);
-               pHeader->Invalidate(false);
-               pHeader->SetName(id + L":");
-               SetActionBarsVisible(FORM_ACTION_BAR_FOOTER, false);
-
-               delete pBitmapNormal;
-               delete pBitmapPress;
-       }
-}
-
-void
 AppSettingForm::OnKeypadOpened(Tizen::Ui::Control& source)
 {
+       unsigned int hashCode = source.GetName().GetHashCode();
+       ItemTag* itemTag = GetTranslateTableHashCodeToItemTag(hashCode);
+       __pTableView->ScrollToItem(itemTag->GetGroupIndex(), itemTag->GetItemIndex(), TABLE_VIEW_SCROLL_ITEM_ALIGNMENT_BOTTOM);
 }
 
 void
 AppSettingForm::OnKeypadClosed(Tizen::Ui::Control& source)
 {
-       if (__pGroupItemNodeList == null)
-       {
-               AppLogDebug("__pGroupItemNodeList is null");
-               CreateHeader(L"AppSettingDefault");
-               return;
-       }
-
-       Node* pNode = null;
-       result r = __pGroupItemNodeList->GetAt(0, pNode);
-       if ((pNode == null)
-               || (IsFailed(r)))
-       {
-               if (pNode == null)
-               {
-                       AppLogDebug("pNode is null");
-               }
-               else
-               {
-                       AppLogDebug("GetAt fail [%s]", GetErrorMessage(r));
-               }
-               CreateHeader(L"AppSettingDefault");
-               return;
-       }
-
-       Node* pParent = pNode->GetParent();
-       if ((pParent == null)
-               || (!pParent->GetType().Equals(L"setting", false)))
-       {
-               if (pParent == null)
-               {
-                       AppLogDebug("pParent is null");
-               }
-               else
-               {
-                       AppLogDebug("pParent is not setting element [%ls]", pParent->GetType().GetPointer());
-               }
-               CreateHeader(L"AppSettingDefault");
-               return;
-       }
-
-       String* pTitle = pParent->GetAttributeN(L"title");
-       if (pTitle == null)
-       {
-               AppLogDebug("pTitle is null");
-               CreateHeader(L"AppSettingDefault");
-               return;
-       }
-       CreateHeader(*pTitle);
-       delete pTitle;
-
-
        Clipboard* pClipboard = Clipboard::GetInstance();
        if (pClipboard != null && pClipboard->IsPopupVisible() == true)
        {
index dcdd96b..36f9604 100644 (file)
@@ -158,6 +158,8 @@ BluetoothForm::OnInitializing(void)
                }
                return r;
        }
+       __pTableView->UpdateTableView();
+       __pTableView->CollapseGroup(BLUETOOTH_GROUP_INDEX_1);
        return E_SUCCESS;
 }
 
@@ -177,8 +179,6 @@ BluetoothForm::OnTerminating(void)
 void
 BluetoothForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousSceneId, const Tizen::Ui::Scenes::SceneId& currentSceneId, Tizen::Base::Collection::IList* pArgs)
 {
-       __pTableView->CollapseGroup(BLUETOOTH_GROUP_INDEX_1);
-       __pTableView->UpdateTableView();
        if (__pBluetoothPresentationModelInstance == null)
        {
                if (pArgs != null)
index 5f14940..17cf75b 100644 (file)
@@ -43,7 +43,6 @@ static const int ID_ITEM_DATE_AND_TIME_DATE_AND_TIME = 1;
 
 static const int ID_GROUP_DATE_AND_TIME_FORMAT = 2;
 static const int ID_GROUP_DATE_AND_TIME_FORMAT_ITEM_COUNT = 1;
-static const int ID_ITEM_DATE_AND_TIME_FORMAT_TIME_FORMAT = 0;
 
 static const int ID_GROUP_DATE_AND_TIME_FORMAT_LIST = 3;
 static const int ID_GROUP_DATE_AND_TIME_FORMAT_LIST_ITEM_COUNT = 2;
@@ -52,26 +51,15 @@ static const int ID_ITEM_DATE_AND_TIME_FORMAT_24_HOURS = 1;
 
 static const int ID_GROUP_DATE_AND_TIME_FIRST_DAY = 4;
 static const int ID_GROUP_DATE_AND_TIME_FIRST_DAY_ITEM_COUNT = 1;
-static const int ID_ITEM_DATE_AND_TIME_FORMAT_FIRST_DAY = 0;
 
 static const int ID_GROUP_DATE_AND_TIME_FIRST_DAY_LIST = 5;
 static const int ID_GROUP_DATE_AND_TIME_FIRST_DAY_LIST_ITEM_COUNT = 2;
 static const int ID_ITEM_DATE_AND_TIME_FORMAT_FIRST_DAY_MONDAY = 0;
 static const int ID_ITEM_DATE_AND_TIME_FORMAT_FIRST_DAY_SUNDAY = 1;
 
-#if DISPLAY_SETTING_MENU_FOR_R0
 static const int ID_GROUP_COUNT = 4;
-static const int ID_GROUP_MAX_ITEM_COUNT = ID_GROUP_DATE_AND_TIME_FORMAT_LIST_ITEM_COUNT;
-#else
-static const int ID_GROUP_COUNT = 6;
-static const int ID_GROUP_MAX_ITEM_COUNT = ID_GROUP_DATE_AND_TIME_FIRST_DAY_ITEM_COUNT;
-#endif
-
-static const int TIME_FORMAT_COUNT = 2;
 
 static const int SIXTY_MINUTES_TO_HOUR = 60;
-static const int X_EDIT_TIME = 500;
-static const int Y_EDIT_DATE_AND_TIME = -20;
 static const int H_GROUP_ITEM_EDITFIELD_DEFAULT = 120;
 
 static const int NEXT_INDEX = 1;
@@ -82,7 +70,8 @@ static const int DIVIDE_BY_TWO = 2;
 static const int TIME_FIELD_GAP = 20;
 
 static const int RELATIVE_LAYOUT_RIGHT_MARGIN_ONOFF_SLIDING = 240;
-static const int RELATIVE_LAYOUT_RIGHT_MARGIN_DETAIL_BUTTON = 90;
+static const int DEVIDE_TWO = 2;
+static const int SECOND_CONTROL_ITEM = 1;
 
 DateTimeForm::DateTimeForm(void)
 {
@@ -111,6 +100,8 @@ DateTimeForm::OnInitializing(void)
        CreateHeader(ResourceManager::GetString(L"IDS_ST_BODY_DATE_AND_TIME"));
        CreateFooter();
        CreateTableView();
+       __pTableView->UpdateTableView();
+       __pTableView->CollapseGroup(ID_GROUP_DATE_AND_TIME_FORMAT_LIST);
 
        AppLogDebug("ENTER");
 
@@ -132,9 +123,6 @@ DateTimeForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousSceneI
        bool automaticUpdate = false;
        bool hourFormat = false;
 
-       __pTableView->CollapseGroup(ID_GROUP_DATE_AND_TIME_FORMAT_LIST);
-       __pTableView->UpdateTableView();
-
        if (SettingInfo::GetValue(SETTING_INFO_KEY_LOCALE_UPDATE_AUTO, automaticUpdate) == E_SUCCESS)
        {
                __pTableView->SetItemChecked(ID_GROUP_DATE_AND_TIME_MAIN, ID_ITEM_DATE_AND_TIME_MAIN_AUTOMATIC_UPDATE, automaticUpdate);
@@ -410,8 +398,6 @@ DateTimeForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
 
        case ID_GROUP_DATE_AND_TIME_FORMAT:
                {
-                       style = TABLE_VIEW_ANNEX_STYLE_DETAILED;
-
                        bool hourFormat = false;
                        isSecondLine = true;
 
@@ -578,17 +564,30 @@ DateTimeForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                pLabel->SetTextColor(COLOR_MAIN_TEXT);
 
                pItem->AddControl(*pLabel);
-               if (style == TABLE_VIEW_ANNEX_STYLE_DETAILED)
-               {
-                       relativeLayout.SetMargin(*pLabel, itemRectangle.x, RELATIVE_LAYOUT_RIGHT_MARGIN_DETAIL_BUTTON, 0, 0);
-               }
-               else
-               {
-                       relativeLayout.SetMargin(*pLabel, itemRectangle.x, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
-               }
+               relativeLayout.SetMargin(*pLabel, itemRectangle.x, 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);
 
+               if (groupIndex == ID_GROUP_DATE_AND_TIME_FORMAT)
+               {
+                       Rectangle detailArrow;
+                       Bitmap* pBitmap = ResourceManager::GetBitmapN(IDB_DETAIL_BUTTON_EXPAND_CLOSED);
+
+                       detailArrow = itemRectangle;
+                       detailArrow.y = itemRectangle.y + ((itemHeight - W_DETAIL_ARROW_BUTTON) / DEVIDE_TWO);
+                       detailArrow.height = W_DETAIL_ARROW_BUTTON;
+                       detailArrow.width = W_DETAIL_ARROW_BUTTON;
+
+                       pLabel = new (std::nothrow) Label();
+                       pLabel->Construct(detailArrow, L"");
+
+                       pLabel->SetBackgroundBitmap(*pBitmap);
+
+                       pItem->AddControl(*pLabel);
+                       relativeLayout.SetMargin(*pLabel, itemRectangle.x, RELATIVE_LAYOUT_RIGHT_MARGIN_DETAIL_ARROW_BUTTON, 0, 0);
+                       relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);
+               }
+
                pLabel = new (std::nothrow) Label();
                pLabel->Construct(itemSecondLineTextRect, secondLineText);
                pLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
@@ -715,7 +714,8 @@ DateTimeForm::OnGroupedTableViewItemStateChanged(Tizen::Ui::Controls::GroupedTab
                        {
                                tableView.ExpandGroup(ID_GROUP_DATE_AND_TIME_FORMAT_LIST);
                        }
-                       tableView.UpdateTableView();
+                       tableView.RefreshItem(groupIndex, itemIndex, TABLE_VIEW_REFRESH_TYPE_ITEM_MODIFY);
+                       tableView.ScrollToItem(groupIndex, itemIndex);
                }
                break;
 
@@ -870,6 +870,23 @@ DateTimeForm::UpdateItem(int groupIndex, int itemIndex, Tizen::Ui::Controls::Tab
                pEditTime->SetPosition(pos, 0);
                pItem->Invalidate(true);
        }
+       if (groupIndex == ID_GROUP_DATE_AND_TIME_FORMAT)
+       {
+               Label* pLabel = static_cast<Label*>(pItem->GetControl(SECOND_CONTROL_ITEM));
+               Bitmap* pBitmap = null;
+
+               if (__pTableView->IsGroupExpanded(ID_GROUP_DATE_AND_TIME_FORMAT_LIST))
+               {
+                       pBitmap = ResourceManager::GetBitmapN(IDB_DETAIL_BUTTON_EXPAND_OPENED);
+               }
+               else
+               {
+                       pBitmap = ResourceManager::GetBitmapN(IDB_DETAIL_BUTTON_EXPAND_CLOSED);
+               }
+               pLabel->SetBackgroundBitmap(*pBitmap);
+               pLabel->Invalidate(false);
+               delete pBitmap;
+       }
 }
 
 void
index 54eb076..30937eb 100644 (file)
@@ -66,9 +66,11 @@ static const int ID_GROUP_COUNT = 4;
 static const int ID_GROUP_MAX_ITEM_COUNT = ID_GROUP_FONT_ITEM_COUNT;
 
 static const int H_HELP_TEXT_GAP = 6;
-static const int RELATIVE_LAYOUT_RIGHT_MARGIN_DETAIL_BUTTON = 90;
 static const int FONT_FORM_FIRST_CONTROL = 0;
 static const int FONT_FORM_SECOND_CONTROL = 1;
+static const int FONT_FORM_THIRD_CONTROL = 2;
+static const int DEVIDE_TWO = 2;
+static const int SECOND_CONTROL_ITEM = 1;
 
 FontForm::FontForm(void)
        : __isAppControlRequest(false)
@@ -166,6 +168,7 @@ FontForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousSceneId, c
        }
        __pTableView->RefreshItem(ID_GROUP_FONT_SIZE, ID_ITEM_FONT_SIZE, TABLE_VIEW_REFRESH_TYPE_ITEM_MODIFY);
        __pTableView->RefreshItem(ID_GROUP_FONT_LIST, ID_ITEM_FONT_TYPE, TABLE_VIEW_REFRESH_TYPE_ITEM_MODIFY);
+       __pTableView->RefreshItem(ID_GROUP_FONT, ID_ITEM_FONT_TYPE, TABLE_VIEW_REFRESH_TYPE_ITEM_MODIFY);
 }
 
 void
@@ -318,25 +321,14 @@ FontForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
        int fontSize = GetFontSize();
        bool isTwoLineText = true;
        int itemHeight = H_GROUP_ITEM_DEFAULT;
+       Rectangle detailArrow;
+       Bitmap* pBitmap = null;
 
-       switch (groupIndex)
+       if (groupIndex == ID_GROUP_FONT_LIST)
        {
-       case ID_GROUP_FONT:
-               {
-                       style = TABLE_VIEW_ANNEX_STYLE_DETAILED;
-               }
-               break;
-
-       case ID_GROUP_FONT_LIST:
-               {
-                       String currentFontType;
-                       isTwoLineText = false;
-                       style = TABLE_VIEW_ANNEX_STYLE_RADIO;
-               }
-               break;
-
-       default:
-               break;
+               String currentFontType;
+               isTwoLineText = false;
+               style = TABLE_VIEW_ANNEX_STYLE_RADIO;
        }
 
        GetTableViewItemString(groupIndex, itemIndex, itemText, secondLineText);
@@ -361,17 +353,29 @@ FontForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                pLabel->SetTextColor(COLOR_MAIN_TEXT);
 
                pItem->AddControl(*pLabel);
-               if (style == TABLE_VIEW_ANNEX_STYLE_DETAILED)
-               {
-                       relativeLayout.SetMargin(*pLabel, itemRectangle.x, RELATIVE_LAYOUT_RIGHT_MARGIN_DETAIL_BUTTON, 0, 0);
-               }
-               else
-               {
-                       relativeLayout.SetMargin(*pLabel, itemRectangle.x, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
-               }
+               relativeLayout.SetMargin(*pLabel, itemRectangle.x, 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);
 
+               if (groupIndex == ID_GROUP_FONT)
+               {
+                       pBitmap = ResourceManager::GetBitmapN(IDB_DETAIL_BUTTON_EXPAND_CLOSED);
+
+                       detailArrow = itemRectangle;
+                       detailArrow.y = itemRectangle.y + ((itemHeight - W_DETAIL_ARROW_BUTTON) / DEVIDE_TWO);
+                       detailArrow.height = W_DETAIL_ARROW_BUTTON;
+                       detailArrow.width = W_DETAIL_ARROW_BUTTON;
+
+                       pLabel = new (std::nothrow) Label();
+                       pLabel->Construct(detailArrow, L"");
+
+                       pLabel->SetBackgroundBitmap(*pBitmap);
+
+                       pItem->AddControl(*pLabel);
+                       relativeLayout.SetMargin(*pLabel, itemRectangle.x, RELATIVE_LAYOUT_RIGHT_MARGIN_DETAIL_ARROW_BUTTON, 0, 0);
+                       relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);
+               }
+
                pLabel = new (std::nothrow) Label();
                pLabel->Construct(itemSecondLineTextRect, secondLineText);
                pLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
@@ -471,6 +475,8 @@ FontForm::OnGroupedTableViewItemStateChanged(Tizen::Ui::Controls::GroupedTableVi
                        {
                                __pTableView->ExpandGroup(ID_GROUP_FONT_LIST);
                        }
+
+                       __pTableView->RefreshItem(groupIndex, itemIndex, TABLE_VIEW_REFRESH_TYPE_ITEM_MODIFY);
                }
                break;
 
@@ -480,8 +486,6 @@ FontForm::OnGroupedTableViewItemStateChanged(Tizen::Ui::Controls::GroupedTableVi
                        String fontGetValue;
                        fontReturnValue = static_cast<String*>(__fontList->GetAt(itemIndex))->GetPointer();
 
-//                     tableView.UpdateTableView();
-
                        for (int count = 0; count < listCount; count++)
                        {
                                if (itemIndex == count)
@@ -548,7 +552,41 @@ FontForm::UpdateItem(int groupIndex, int itemIndex, Tizen::Ui::Controls::TableVi
        switch (groupIndex)
        {
        case ID_GROUP_FONT:
-               // fall through
+               {
+                       ItemTypeTwoLine(firstLine, secondLine, fontSize);
+
+                       pItemBounds.height = firstLine.height + secondLine.height;
+                       pItem->SetBounds(pItemBounds);
+                       Label* pFirstLabel = static_cast<Label*>(pItem->GetControl(FONT_FORM_FIRST_CONTROL));
+                       Label* pSecondLabel = static_cast<Label*>(pItem->GetControl(FONT_FORM_SECOND_CONTROL));
+                       Label* pThirdLabel = static_cast<Label*>(pItem->GetControl(FONT_FORM_THIRD_CONTROL));
+                       Rectangle detailArrow = pSecondLabel->GetBounds();
+                       detailArrow.y = firstLine.y + ((pItemBounds.height - W_DETAIL_ARROW_BUTTON) / DEVIDE_TWO);
+
+                       pFirstLabel->SetBounds(firstLine);
+                       pFirstLabel->SetTextConfig(fontSize, LABEL_TEXT_STYLE_NORMAL);
+                       pSecondLabel->SetBounds(detailArrow);
+                       pThirdLabel->SetBounds(secondLine);
+                       pThirdLabel->SetTextConfig(FONT_SIZE_SUB_TEXT, LABEL_TEXT_STYLE_NORMAL);
+
+                       Bitmap* pBitmap = null;
+
+                       if (__pTableView->IsGroupExpanded(ID_GROUP_FONT_LIST))
+                       {
+                               pBitmap = ResourceManager::GetBitmapN(IDB_DETAIL_BUTTON_EXPAND_OPENED);
+                       }
+                       else
+                       {
+                               pBitmap = ResourceManager::GetBitmapN(IDB_DETAIL_BUTTON_EXPAND_CLOSED);
+                       }
+                       pSecondLabel->SetBackgroundBitmap(*pBitmap);
+                       pSecondLabel->Invalidate(false);
+                       pFirstLabel->Invalidate(false);
+                       pItem->Invalidate(false);
+                       delete pBitmap;
+               }
+               break;
+
        case ID_GROUP_FONT_SIZE:
                {
                        ItemTypeTwoLine(firstLine, secondLine, fontSize);
index 75a626d..5998886 100644 (file)
@@ -30,7 +30,6 @@ using namespace Tizen::Ui;
 using namespace Tizen::Ui::Controls;
 using namespace Tizen::Ui::Scenes;
 
-#ifdef DISPLAY_SETTING_MENU_FOR_R0
 static const int ID_GROUP_KEYBOARD_SOFTWARE = 0;
 static const int ID_GROUP_KEYBOARD_SOFTWARE_ITEM_COUNT = 1;
 static const int ID_ITEM_KEYBOARD_SOFTWARE_SELECT_KEYBOARD = 0;
@@ -42,25 +41,6 @@ static const int ID_ITEM_KEYBOARD_HARDWARE_SELECT_KEYBOARD = 0;
 static const int ID_ITEM_KEYBOARD_HARDWARE_KEYBOARD_SETTING = 1;
 
 static const int ID_GROUP_COUNT = 1;
-static const int ID_GROUP_ITEM_COUNT = ID_GROUP_KEYBOARD_SOFTWARE_ITEM_COUNT;
-#else
-static const int ID_GROUP_KEYBOARD_MAIN = 0;
-static const int ID_GROUP_KEYBOARD_MAIN_ITEM_COUNT = 1;
-static const int ID_ITEM_KEYBOARD_MAIN_AUTO_CAPITALISATION = 0;
-
-static const int ID_GROUP_KEYBOARD_SOFTWARE = 1;
-static const int ID_GROUP_KEYBOARD_SOFTWARE_ITEM_COUNT = 2;
-static const int ID_ITEM_KEYBOARD_SOFTWARE_SELECT_KEYBOARD = 0;
-static const int ID_ITEM_KEYBOARD_SOFTWARE_KEYBOARD_SETTING = 1;
-
-static const int ID_GROUP_KEYBOARD_HARDWARE = 2;
-static const int ID_GROUP_KEYBOARD_HARDWARE_ITEM_COUNT = 2;
-static const int ID_ITEM_KEYBOARD_HARDWARE_SELECT_KEYBOARD = 0;
-static const int ID_ITEM_KEYBOARD_HARDWARE_KEYBOARD_SETTING = 1;
-
-static const int ID_GROUP_COUNT = 3;
-static const int ID_GROUP_ITEM_COUNT = ID_GROUP_KEYBOARD_HARDWARE_ITEM_COUNT;
-#endif
 
 KeyboardForm::KeyboardForm(void)
 {
@@ -138,13 +118,6 @@ KeyboardForm::GetItemCount(int groupIndex)
 
        switch (groupIndex)
        {
-#ifndef DISPLAY_SETTING_MENU_FOR_R0    
-       case ID_GROUP_KEYBOARD_MAIN:
-               {
-                       itemCount = ID_GROUP_KEYBOARD_MAIN_ITEM_COUNT;
-               }
-               break;
-#endif
        case ID_GROUP_KEYBOARD_SOFTWARE:
                {
                        itemCount = ID_GROUP_KEYBOARD_SOFTWARE_ITEM_COUNT;
@@ -181,14 +154,6 @@ KeyboardForm::CreateGroupItem(int groupIndex, int itemWidth)
 
        switch (groupIndex)
        {
-#ifndef DISPLAY_SETTING_MENU_FOR_R0
-       case ID_GROUP_KEYBOARD_MAIN:
-               {
-                       yItemOffset = H_GROUP_INDEX_HELP_TEXT_TOP_GAP;
-                       itemHeight = H_GROUP_INDEX_NO_TITLE_DEFAULT;
-               }
-               break;
-#endif
        case ID_GROUP_KEYBOARD_SOFTWARE:
                {
                        yItemOffset = H_GROUP_INDEX_NO_HELP_TEXT_GAP;
@@ -300,14 +265,6 @@ KeyboardForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                }
                break;
 
-#ifndef DISPLAY_SETTING_MENU_FOR_R0
-       case ID_GROUP_KEYBOARD_MAIN:
-               {
-                       itemText = ResourceManager::GetString(L"IDS_IME_BODY_AUTO_CAPITALISATION");
-               }
-               break;
-#endif
-
        default:
                break;
        }
@@ -366,16 +323,6 @@ KeyboardForm::OnGroupedTableViewItemStateChanged(Tizen::Ui::Controls::GroupedTab
 
        switch (groupIndex)
        {
-#ifndef DISPLAY_SETTING_MENU_FOR_R0
-       case ID_ITEM_KEYBOARD_MAIN_AUTO_CAPITALISATION:
-               {
-                       if (itemIndex == ID_ITEM_KEYBOARD_MAIN_AUTO_CAPITALISATION)
-                       {
-                               // TODO: auto capitalisation first letter in keyboard.
-                       }
-               }
-               break;
-#endif
        case ID_GROUP_KEYBOARD_SOFTWARE:
                {
                        if (itemIndex == ID_ITEM_KEYBOARD_SOFTWARE_SELECT_KEYBOARD)
index 18ac461..eb4e53a 100644 (file)
@@ -37,34 +37,14 @@ static const int ID_GROUP_GPS_1 = 0;
 static const int ID_GROUP_GPS_1_ITEM_COUNT = 1;
 static const int ID_ITEM_GPS_ON_OFF = 0;
 
-#ifdef DISPLAY_SETTING_MENU_FOR_R0
 static const int ID_GROUP_GPS_2 = 1;
 static const int ID_GROUP_GPS_2_ITEM_COUNT = 1;
 static const int ID_ITEM_GPS_NETWORK_POSITION = 0;
 static const int ID_GROUP_GPS_3 = 2;
 static const int ID_GROUP_GPS_3_ITEM_COUNT = 0;
-#else
-static const int ID_GROUP_GPS_2 = 1;
-static const int ID_GROUP_GPS_2_ITEM_COUNT = 3;
-static const int ID_ITEM_GPS_ADVANCED_GPS = 0;
-static const int ID_ITEM_GPS_NETWORK_POSITION = 1;
-static const int ID_ITEM_GPS_MY_POSITION = 2;
-
-static const int ID_GROUP_GPS_3 = 2;
-static const int ID_GROUP_GPS_3_ITEM_COUNT = 2;
-static const int ID_GROUP_GPS_HOME_SCREEN = 0;
-static const int ID_GROUP_GPS_ACCU_WEATHER = 1;
-#endif
 
 static const int ID_GROUP_COUNT = 3;
-static const int ID_GROUP_MAX_ITEM_COUNT = ID_GROUP_GPS_2_ITEM_COUNT;
-
-static const int ID_LOCATION_FOOTER_SCAN = 0;
-static const int ID_LOCATION_FOOTER_EMPTY1 = 1;
-static const int ID_LOCATION_FOOTER_EMPTY2 = 2;
-
 static const int ID_FOOTER_ITEM_INDEX_1 = 0;
-static const int ID_FOOTER_ITEM_INDEX_2 = 1;
 
 static const int IDA_FOOTER_ITEM_HELP = 100;
 
@@ -208,11 +188,7 @@ LocationForm::GetItemCount(int groupIndex)
 
        case ID_GROUP_GPS_3:
                {
-#ifndef DISPLAY_SETTING_MENU_FOR_R0
                        itemCount = ID_GROUP_GPS_3_ITEM_COUNT;
-#else
-                       itemCount = ID_GROUP_GPS_3_ITEM_COUNT;
-#endif
                }
                break;
 
@@ -328,49 +304,9 @@ LocationForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                                }
                                break;
 
-#ifndef DISPLAY_SETTING_MENU_FOR_R0
-                       case ID_ITEM_GPS_ADVANCED_GPS:
-                               {
-                                       itemText = ResourceManager::GetString(L"IDS_ST_BODY_ADVANCED_GPS");
-                               }
-                               break;
-
-                       case ID_ITEM_GPS_MY_POSITION:
-                               {
-                                       style = TABLE_VIEW_ANNEX_STYLE_NORMAL;
-                                       itemText = ResourceManager::GetString(L"IDS_LBS_BODY_MY_POSITION");
-                               }
-                               break;
-#endif
-
-                       default:
-                               break;
-                       }
-               }
-               break;
-
-       case ID_GROUP_GPS_3:
-               {
-#ifndef DISPLAY_SETTING_MENU_FOR_R0
-                       switch (itemIndex)
-                       {
-                       case ID_GROUP_GPS_HOME_SCREEN:
-                       {
-                               itemText = ResourceManager::GetString(L"IDS_ST_BODY_HOMESCREEN");
-
-                       }
-                       break;
-
-                       case ID_GROUP_GPS_ACCU_WEATHER:
-                       {
-//                             itemText = ResourceManager::GetString(L"IDS_LOCATION_ACCUWEATHER");
-                       }
-                       break;
-
                        default:
                                break;
                        }
-#endif
                }
                break;
 
@@ -460,34 +396,9 @@ LocationForm::OnGroupedTableViewItemStateChanged(Tizen::Ui::Controls::GroupedTab
                                        tableView.SetItemChecked(groupIndex, itemIndex, itemSelectStatus);
                                }
                        }
-#ifndef DISPLAY_SETTING_MENU_FOR_R0
-                       if (itemIndex == ID_ITEM_GPS_ADVANCED_GPS)
-                       {
-                               // TODO: nothing todo yet.
-                       }
-                       if (itemIndex == ID_ITEM_GPS_MY_POSITION)
-                       {
-                               // TODO: nothing todo yet.
-                       }
-#endif
                }
                break;
 
-#ifndef DISPLAY_SETTING_MENU_FOR_R0
-       case ID_GROUP_GPS_3:
-               {
-                       if (itemIndex == ID_GROUP_GPS_HOME_SCREEN)
-                       {
-                               // TODO: nothing todo yet.
-                       }
-                       if (itemIndex == ID_GROUP_GPS_ACCU_WEATHER)
-                       {
-                               // TODO: nothing todo yet.
-                       }
-               }
-               break;
-#endif
-
        default:
                break;
        }
index 8c2cd2d..6b1b33d 100644 (file)
@@ -42,18 +42,6 @@ using namespace Tizen::Ui::Scenes;
 
 static const int ID_GROUP_CONNECTIVITY = 0;
 
-#ifndef DISPLAY_SETTING_MENU_FOR_R0
-static const int ID_ALL_CONNECTIVITY_ITEM_COUNT = 6;
-static const int ID_FREQUENTLY_CONNECTIVITY_ITEM_COUNT = 5;
-
-static const int ID_ITEM_CONNECTIVITY_FLIGHTMODE = 0;
-static const int ID_ITEM_CONNECTIVITY_WIFI = 1;
-static const int ID_ITEM_CONNECTIVITY_LOCATION = 2;
-static const int ID_ITEM_CONNECTIVITY_NETWORK = 3;
-static const int ID_ITEM_CONNECTIVITY_MORESETTINGS = 4;
-static const int ID_ITEM_CONNECTIVITY_BLUETOOTH = 4;
-static const int ID_ITEM_CONNECTIVITY_WIFI_DIRECT = 5;
-#else
 static const int ID_ALL_CONNECTIVITY_ITEM_COUNT = 5;
 static const int ID_FREQUENTLY_CONNECTIVITY_ITEM_COUNT = 5;
 static const int ID_ITEM_CONNECTIVITY_FLIGHTMODE = 0;
@@ -62,11 +50,9 @@ static const int ID_ITEM_CONNECTIVITY_LOCATION = 2;
 static const int ID_ITEM_CONNECTIVITY_NETWORK = 3;
 static const int ID_ITEM_CONNECTIVITY_MORESETTINGS = 4;
 static const int ID_ITEM_CONNECTIVITY_BLUETOOTH = 4;
-#endif
 
 static const int ID_GROUP_SYSTEM = 1;
 
-#ifdef DISPLAY_SETTING_MENU_FOR_R0
 static const int ID_ALL_SYSTEM_ITEM_COUNT = 9;
 static const int ID_FREQUENTLY_SYSTEM_ITEM_COUNT = 3;
 
@@ -81,56 +67,23 @@ static const int ID_ITEM_SYSTEM_KEYBOARD = 6;
 static const int ID_ITEM_SYSTEM_MANAGE_APPLICATION = 7;
 static const int ID_ITEM_SYSTEM_DEVELOPER_OPTION = 8;
 static const int ID_ITEM_SYSTEM_ABOUT_PHONE = 9;
-#else
-static const int ID_ALL_SYSTEM_ITEM_COUNT = 18;
-static const int ID_FREQUENTLY_SYSTEM_ITEM_COUNT = 6;
-
-static const int ID_ITEM_SYSTEM_EVENTS_NOTIFICATION = 0;
-static const int ID_ITEM_SYSTEM_WALLPAPER = 1;
-static const int ID_ITEM_SYSTEM_SOUND = 2;
-static const int ID_ITEM_SYSTEM_BRIGHTNESS = 3;
-static const int ID_ITEM_SYSTEM_SECURITY= 4;
-static const int ID_ITEM_SYSTEM_MORESETTINGS = 5;
-static const int ID_ITEM_SYSTEM_FONT = 5;
-static const int ID_ITEM_SYSTEM_DISPLAY = 6;
-static const int ID_ITEM_SYSTEM_HOME_SCREEN = 7;
-static const int ID_ITEM_SYSTEM_AUTO_ROTATE_SCREEN = 8;
-static const int ID_ITEM_SYSTEM_DATE_AND_TIME = 9;
-static const int ID_ITEM_SYSTEM_LANGUAGE_AND_REGION = 10;
-static const int ID_ITEM_SYSTEM_KEYBOARD = 11;
-static const int ID_ITEM_SYSTEM_STORAGE = 12;
-static const int ID_ITEM_SYSTEM_MANAGE_APPLICATION = 13;
-static const int ID_ITEM_SYSTEM_MEMORY = 14;
-static const int ID_ITEM_SYSTEM_RESET = 15;
-static const int ID_ITEM_SYSTEM_DEVELOPER_OPTION = 16;
-static const int ID_ITEM_SYSTEM_ABOUT_PHONE = 17;
-#endif
 
 static const int ID_GROUP_APPLICATIONS = 2;
 
-#ifdef DISPLAY_SETTING_MENU_FOR_R0
-static const int ID_APPLICATIONS_ITEM_COUNT = 6;
-#else
 static const int ID_APPLICATIONS_ITEM_COUNT = 7;
-#endif
-static const int ID_ITEM_APPLICATIONS_PHONE = 0;
-static const int ID_ITEM_APPLICATIONS_MESSAGE = 1;
-static const int ID_ITEM_APPLICATIONS_EMAIL = 2;
-static const int ID_ITEM_APPLICATIONS_CONTACTS = 3;
-static const int ID_ITEM_APPLICATIONS_CALENDAR = 4;
-static const int ID_ITEM_APPLICATIONS_GALLERY = 5;
-
-#ifndef DISPLAY_SETTING_MENU_FOR_R0
-static const int ID_ITEM_APPLICATIONS_VOICERECODER = 7;
-#endif
+static const int ID_ITEM_APPLICATION_ACCOUNTS = 0;
+static const int ID_ITEM_APPLICATIONS_PHONE = 1;
+static const int ID_ITEM_APPLICATIONS_MESSAGE = 2;
+static const int ID_ITEM_APPLICATIONS_EMAIL = 3;
+static const int ID_ITEM_APPLICATIONS_CONTACTS = 4;
+static const int ID_ITEM_APPLICATIONS_CALENDAR = 5;
+static const int ID_ITEM_APPLICATIONS_GALLERY = 6;
 
 static const int ID_GROUP_DOWNLOADED_APPLICATIONS = 3;
-static const int ID_GROUP_DOWNLOADED_APPLICATIONS_ITEM_COUNT = 1;
 
 static const int ID_GROUP_COUNT_NO_DOWNLOADAPP = 3;
 
 static const int ID_GROUP_COUNT = 4;
-static const int ID_GROUP_MAX_ITEM_COUNT = ID_APPLICATIONS_ITEM_COUNT;
 
 static const int ID_GROUP_INDEX_1 = 0;
 static const int ID_GROUP_INDEX_2 = 1;
@@ -141,18 +94,8 @@ static const int ID_PAGE_FREQUENTLY_USE = 0;
 static const int ID_PAGE_ALL = 1;
 
 static const int IDA_PAGE_SWITCH = 100;
-static const int ID_PAGE_NULL = 101;
 
 static const int FOOTER_ITEM_INDEX_1 = 0;
-static const int FOOTER_ITEM_INDEX_2 = 1;
-
-static const int BLUETOOTH_ON_OFF_OPTION = 2;
-static const int BLUETOOTH_OFF_OPTION = 0;
-static const int BLUETOOTH_ON_OPTION = 1;
-
-static const int BRIGHTNESS_MANUAL_AUTO_OPTION = 2;
-static const int BRIGHTNESS_MANUAL_OPTION = 0;
-static const int BRIGHTNESS_AUTO_OPTION = 1;
 
 static const int W_RESIZE_LABEL_GAP = 110;
 static const int H_GROUP_FONT_SIZE_GIANT = 146;
@@ -166,6 +109,15 @@ static const int MAIN_RELATIVE_LAYOUT_RIGHT_MARGIN = 60;
 static const wchar_t* ID_RELATIVE_SETTING_XML_FILE_PATH = L"/setting/setting.xml";
 static const wchar_t* ID_APPLICATION_DEFAULT_FOLDER_PATH = L"/opt/apps/";
 
+static const wchar_t* APPCONTROL_OPERATION_ID_CONFIGURE = L"http://tizen.org/appcontrol/operation/configure";
+static const wchar_t* APPCONTROL_PROVIDER_ID_ACCOUNT = L"ZsnYtAdjl2.Account";
+static const wchar_t* APPCONTROL_PROVIDER_ID_PHONE = L"tizen.phone";
+static const wchar_t* APPCONTROL_PROVIDER_ID_MESSAGE = L"tizen.messages";
+static const wchar_t* APPCONTROL_PROVIDER_ID_EMAIL = L"tizen.email";
+static const wchar_t* APPCONTROL_PROVIDER_ID_CONTACTS = L"tizen.contacts";
+static const wchar_t* APPCONTROL_PROVIDER_ID_CALENDAR = L"tizen.calendar";
+static const wchar_t* APPCONTROL_PROVIDER_ID_GALLERY = L"tizen.gallery";
+
 void
 IFlightModeSetValueAsyncResultListener::OnResultReceivedForSetValueAsync(const Tizen::Base::String& key, result r)
 {
@@ -429,10 +381,6 @@ MainMenuForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
        bool isTwoLineItemText = false;
        bool isDrawBitmapIcon = true;
        bool EnableStatus = false;
-#ifndef DISPLAY_SETTING_MENU_FOR_R0
-       int isBrightnessAuto = BRIGHTNESS_MANUAL_OPTION;
-#endif
-       int btEnableStatus = BLUETOOTH_OFF_OPTION;
        Rectangle itemRectIcon;
        Rectangle itemRectLabel;
        Rectangle itemRectSecondLabel;
@@ -454,12 +402,6 @@ MainMenuForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                        case ID_ITEM_CONNECTIVITY_FLIGHTMODE:
                                {
                                        style = TABLE_VIEW_ANNEX_STYLE_ONOFF_SLIDING;
-                                       bool EnableStatus = false;
-
-                                       if (SettingInfo::GetValue(SETTING_INFO_KEY_NETWORK_FLIGHTMODE, EnableStatus) == E_SUCCESS)
-                                       {
-                                               __pTableView->SetItemChecked(groupIndex, itemIndex, EnableStatus);
-                                       }
                                        itemRectLabel.width -= W_RESIZE_LABEL_GAP;
                                        pBitmap = ResourceManager::GetBitmapN(IDB_FLIGHT_MODE);
                                        itemText = ResourceManager::GetString(L"IDS_ST_BODY_FLIGHT_MODE");
@@ -487,16 +429,7 @@ MainMenuForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                                }
                                break;
 
-#ifndef DISPLAY_SETTING_MENU_FOR_R0
-                       case ID_ITEM_CONNECTIVITY_WIFI_DIRECT:
-                               {
-                                       pBitmap = ResourceManager::GetBitmapN(IDB_WIFI_DIRECT);
-                                       itemText = ResourceManager::GetString(L"IDS_ST_HEADER_WI_FI_DIRECT");
-                               }
-                               break;
-#endif
-
-                       default:
+                       case ID_ITEM_CONNECTIVITY_BLUETOOTH:
                                {
                                        isTwoLineItemText = true;
                                        itemHeight = H_GROUP_ITEM_TWO_LINE_DEFAULT;
@@ -515,29 +448,31 @@ MainMenuForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                                                itemHeight = (itemRectLabel.height + itemRectSecondLabel.height);
                                                pBitmap = ResourceManager::GetBitmapN(IDB_BLUETOOTH);
 
+                                               itemText = ResourceManager::GetString(L"IDS_ST_BODY_BLUETOOTH");
+
                                                if (SystemInfo::GetValue(SYSTEM_INFO_KEY_BLUETOOTH, EnableStatus) == E_SUCCESS)
                                                {
                                                        if (EnableStatus == true)
                                                        {
-                                                               btEnableStatus = BluetoothPresentationModel::GetInstance()->IsBluetoothActivated();
+                                                               int btEnableStatus = BluetoothPresentationModel::GetInstance()->IsBluetoothActivated();
+
                                                                if (btEnableStatus == true)
                                                                {
                                                                        itemTextTwoLine = ResourceManager::GetString(L"IDS_ST_BODY_ON");
                                                                }
-                                                               else
-                                                               {
-                                                                       itemTextTwoLine = ResourceManager::GetString(L"IDS_ST_BODY_OFF");
-                                                               }
-                                                       }
-                                                       else
-                                                       {
-                                                               itemTextTwoLine = ResourceManager::GetString(L"IDS_ST_BODY_OFF");
                                                        }
                                                }
-                                               itemText = ResourceManager::GetString(L"IDS_ST_BODY_BLUETOOTH");
+
+                                               if (itemTextTwoLine.IsEmpty())
+                                               {
+                                                       itemTextTwoLine = ResourceManager::GetString(L"IDS_ST_BODY_OFF");
+                                               }
                                        }
                                }
                                break;
+
+                       default:
+                               break;
                        }
                }
                break;
@@ -562,16 +497,10 @@ MainMenuForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
 
                        case ID_ITEM_SYSTEM_AUTO_ROTATE_SCREEN:
                                {
-                                       bool autoRotation = false;
                                        style = TABLE_VIEW_ANNEX_STYLE_ONOFF_SLIDING;
                                        itemRectLabel.width -= W_RESIZE_LABEL_GAP;
                                        pBitmap = ResourceManager::GetBitmapN(IDB_AUTO_ROTATE_SCREEN);
                                        itemText = ResourceManager::GetString(L"IDS_ST_HEADER_AUTO_ROTATE_SCREEN_ABB");
-
-                                       if (SettingInfo::GetValue(SETTING_INFO_KEY_SCREEN_ROTAION_AUTO, autoRotation) == E_SUCCESS)
-                                       {
-                                               __pTableView->SetItemChecked(groupIndex, itemIndex, autoRotation);
-                                       }
                                }
                                break;
 
@@ -602,14 +531,6 @@ MainMenuForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                                        itemText = ResourceManager::GetString(L"IDS_ST_BODY_MANAGE_APPLICATIONS");
                                }
                                break;
-#ifndef DISPLAY_SETTING_MENU_FOR_R0
-                       case ID_ITEM_SYSTEM_MEMORY:
-                               {
-                                       pBitmap = ResourceManager::GetBitmapN(IDB_STORAGE);
-                                       itemText = ResourceManager::GetString(L"IDS_ST_BODY_STORAGE");
-                               }
-                               break;
-#endif
 
                        case ID_ITEM_SYSTEM_DEVELOPER_OPTION:
                                {
@@ -625,76 +546,6 @@ MainMenuForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                                }
                                break;
 
-#ifndef DISPLAY_SETTING_MENU_FOR_R0
-                       case ID_ITEM_SYSTEM_EVENTS_NOTIFICATION:
-                               {
-                                       pBitmap = ResourceManager::GetBitmapN(IDB_EVENT_NOTIFICATION);
-                                       itemText = ResourceManager::GetString(L"IDS_ST_BODY_EVENTS_NOTIFICATIONS");
-                               }
-                               break;
-
-                       case ID_ITEM_SYSTEM_BRIGHTNESS:
-                               {
-                                       isTwoLineItemText = true;
-                                       itemHeight = H_GROUP_ITEM_TWO_LINE_DEFAULT;
-                                       ItemTypeIconAndTwoLine(itemRectIcon, itemRectLabel, itemRectSecondLabel, fontSize);
-                                       pBitmap = ResourceManager::GetBitmapN(String(IDB_BRIGHTNESS));
-                                       itemText = ResourceManager::GetString(L"IDS_ST_BODY_BRIGHTNESS");
-
-                                       if (isBrightnessAuto == BRIGHTNESS_MANUAL_OPTION)
-                                       {
-                                               itemTextTwoLine = ResourceManager::GetString(L"IDS_ST_BODY_AUTOMATIC");
-                                       }
-                                       else
-                                       {
-                                               itemTextTwoLine = ResourceManager::GetString(L"IDS_ST_BODY_MANUAL");
-                                       }
-                               }
-                               break;
-
-                       case ID_ITEM_SYSTEM_SECURITY:
-                               {
-                                       pBitmap = ResourceManager::GetBitmapN(IDB_SECURITY);
-                                       itemText = ResourceManager::GetString(L"IDS_ST_BODY_SECURITY");
-                               }
-                               break;
-
-                       case ID_ITEM_SYSTEM_DISPLAY:
-                               {
-                                       pBitmap = ResourceManager::GetBitmapN(IDB_DISPLAY);
-                                       itemText = ResourceManager::GetString(L"IDS_ST_BODY_DISPLAY");
-                               }
-                               break;
-
-                       case ID_ITEM_SYSTEM_HOME_SCREEN:
-                               {
-                                       pBitmap = ResourceManager::GetBitmapN(IDB_HOME_SCREEN);
-                                       itemText = ResourceManager::GetString(L"IDS_ST_HEADER_HOME_SCREEN");
-                               }
-                               break;
-
-                       case ID_ITEM_SYSTEM_STORAGE:
-                               {
-                                       pBitmap = ResourceManager::GetBitmapN(IDB_STORAGE);
-                                       itemText = ResourceManager::GetString(L"IDS_ST_BODY_STORAGE");
-                               }
-                               break;
-
-                       case ID_ITEM_SYSTEM_MANAGE_APPLICATION:
-                               {
-                                       pBitmap = ResourceManager::GetBitmapN(IDB_MANAGE_APPLICATION);
-                                       itemText = ResourceManager::GetString(L"IDS_ST_BODY_MANAGE_APPLICATIONS");
-                               }
-                               break;
-
-                       case ID_ITEM_SYSTEM_RESET:
-                               {
-                                       pBitmap = ResourceManager::GetBitmapN(IDB_RESET);
-                                       itemText = ResourceManager::GetString(L"IDS_ST_BODY_RESET");
-                               }
-                               break;
-#endif
-
                        default:
                                {
                                        if (__currentTableViewList == ID_PAGE_FREQUENTLY_USE)
@@ -703,6 +554,9 @@ MainMenuForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                                                isDrawBitmapIcon = false;
                                                ItemTypeTwoLine(itemRectLabel, itemRectSecondLabel, fontSize);
                                                itemHeight = (itemRectLabel.height + itemRectSecondLabel.height);
+
+                                               itemText = ResourceManager::GetString(L"IDS_ST_BODY_MORE_SYSTEM_SETTINGS");
+
                                                itemTextTwoLine = ResourceManager::GetString(L"IDS_ST_BODY_FONT");
                                                itemTextTwoLine.Append(L", ");
                                                itemTextTwoLine.Append(ResourceManager::GetString(L"IDS_ST_HEADER_AUTO_ROTATE_SCREEN_ABB"));
@@ -717,10 +571,7 @@ MainMenuForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                                                itemTextTwoLine.Append(L", ");
                                                itemTextTwoLine.Append(ResourceManager::GetString(L"IDS_ST_BODY_DEVELOPER_OPTIONS"));
                                                itemTextTwoLine.Append(L", ");
-
                                                itemTextTwoLine.Append(ResourceManager::GetString(L"IDS_ST_BODY_ABOUT_PHONE"));
-
-                                               itemText = ResourceManager::GetString(L"IDS_ST_BODY_MORE_SYSTEM_SETTINGS");
                                        }
                                        else
                                        {
@@ -737,6 +588,13 @@ MainMenuForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                {
                        switch (itemIndex)
                        {
+                       case ID_ITEM_APPLICATION_ACCOUNTS:
+                               {
+                                       pBitmap = ResourceManager::GetBitmapN(IDB_ACCOUNTS);
+                                       itemText = ResourceManager::GetString(L"IDS_COM_BODY_ACCOUNTS");
+                               }
+                               break;
+
                        case ID_ITEM_APPLICATIONS_PHONE:
                                {
                                        pBitmap = ResourceManager::GetBitmapN(IDB_PHONE);
@@ -780,12 +638,6 @@ MainMenuForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                                break;
 
                        default:
-                               {
-#ifndef DISPLAY_SETTING_MENU_FOR_R0
-                                       pBitmap = ResourceManager::GetBitmapN(IDB_VOICE_RECODER);
-//                                     itemText = ResourceManager::GetString(L"IDS_SETTING_VOICE_RECODER");
-#endif
-                               }
                                break;
                        }
                }
@@ -1325,13 +1177,7 @@ const wchar_t*
 MainMenuForm::GroupSystemSceneConnect(int viewMode, int itemIndex, Tizen::Ui::Controls::TableViewItemStatus status)
 {
        const wchar_t* pScene = null;
-#ifndef DISPLAY_SETTING_MENU_FOR_R0
-       if (itemIndex == ID_ITEM_SYSTEM_EVENTS_NOTIFICATION)
-       {
-               pScene = IDSCN_NOTIFICATION;
-       }
-       else
-#endif
+
        if (itemIndex == ID_ITEM_SYSTEM_WALLPAPER)
        {
                pScene = IDSCN_WALLPAPER;
@@ -1340,16 +1186,6 @@ MainMenuForm::GroupSystemSceneConnect(int viewMode, int itemIndex, Tizen::Ui::Co
        {
                pScene = IDSCN_SOUNDS;
        }
-#ifndef DISPLAY_SETTING_MENU_FOR_R0    
-       else if (itemIndex == ID_ITEM_SYSTEM_BRIGHTNESS)
-       {
-               pScene = IDSCN_BRIGHTNESS;
-       }
-       else if (itemIndex == ID_ITEM_SYSTEM_SECURITY)
-       {
-               pScene = IDSCN_SECURITY;
-       }
-#endif
        else if ((viewMode == ID_PAGE_FREQUENTLY_USE) && (itemIndex == ID_ITEM_SYSTEM_MORESETTINGS))
        {
                pScene = IDSCN_MORE_SYSTEM;
@@ -1376,38 +1212,6 @@ MainMenuForm::GroupSystemSceneConnect(int viewMode, int itemIndex, Tizen::Ui::Co
                {
                        pScene = IDSCN_MANAGE_APPLICATION;
                }
-#ifndef DISPLAY_SETTING_MENU_FOR_R0
-               else if (itemIndex == ID_ITEM_SYSTEM_DISPLAY)
-               {
-                       pScene = IDSCN_DISPLAY;
-               }
-               else if (itemIndex == ID_ITEM_SYSTEM_HOME_SCREEN)
-               {
-                       // TODO : Scene Control
-                       pScene = L"";
-                       ShowMessageBox(ResourceManager::GetString(L"IDS_EMAIL_POP_ALERT"), ResourceManager::GetString(L"IDS_ST_POP_NOT_SUPPORTED"));
-               }
-               else if (itemIndex == ID_ITEM_SYSTEM_STORAGE)
-               {
-                       // TODO : Scene Control
-                       pScene = L"";
-                       ShowMessageBox(ResourceManager::GetString(L"IDS_EMAIL_POP_ALERT"), ResourceManager::GetString(L"IDS_ST_POP_NOT_SUPPORTED"));
-               }
-               else if (itemIndex == ID_ITEM_SYSTEM_MANAGE_APPLICATION)
-               {
-                       // TODO : Scene Control
-                       pScene = L"";
-                       ShowMessageBox(ResourceManager::GetString(L"IDS_EMAIL_POP_ALERT"), ResourceManager::GetString(L"IDS_ST_POP_NOT_SUPPORTED"));
-               }
-               else if (itemIndex == ID_ITEM_SYSTEM_RESET)
-               {
-                       pScene = IDSCN_RESETTER;
-               }
-               else if (itemIndex == ID_ITEM_SYSTEM_MEMORY)
-               {
-                       pScene = IDSCN_MEMORY;
-               }
-#endif
                else if (itemIndex == ID_ITEM_SYSTEM_DEVELOPER_OPTION)
                {
                        pScene = IDSCN_DEVELOPER_OPTION;
@@ -1454,15 +1258,6 @@ MainMenuForm::GroupConnectivitySceneConnect(int viewMode, int itemIndex, Tizen::
        {
                pScene = IDSCN_BLUETOOTH;
        }
-#ifndef DISPLAY_SETTING_MENU_FOR_R0    
-       else if (itemIndex == ID_ITEM_CONNECTIVITY_WIFI_DIRECT)
-       {
-               if (viewMode == ID_PAGE_ALL)
-               {
-                       pScene = IDSCN_WIFI_DIRECT;
-               }
-       }
-#endif
        else
        {
                pScene = L"";
@@ -1475,7 +1270,7 @@ void
 MainMenuForm::FindAppControlScene(int itemIndex)
 {
        String providerId;
-       String operationId;
+       String operationId = APPCONTROL_OPERATION_ID_CONFIGURE;
 
        ArrayList* pDataList = new (std::nothrow) ArrayList(SingleObjectDeleter);
 
@@ -1483,56 +1278,50 @@ MainMenuForm::FindAppControlScene(int itemIndex)
 
        switch (itemIndex)
        {
+       case ID_ITEM_APPLICATION_ACCOUNTS:
+               {
+                       providerId = APPCONTROL_PROVIDER_ID_ACCOUNT;
+               }
+               break;
+
        case ID_ITEM_APPLICATIONS_PHONE:
                {
-                       providerId = L"tizen.phone";
-                       operationId = L"http://tizen.org/appcontrol/operation/configure";
+                       providerId = APPCONTROL_PROVIDER_ID_PHONE;
                }
                break;
 
        case ID_ITEM_APPLICATIONS_MESSAGE:
                {
-                       providerId = L"tizen.messages";
-                       operationId = L"http://tizen.org/appcontrol/operation/configure";
+                       providerId = APPCONTROL_PROVIDER_ID_MESSAGE;
                }
                break;
 
        case ID_ITEM_APPLICATIONS_EMAIL:
                {
-                       providerId = L"tizen.email";
-                       operationId = L"http://tizen.org/appcontrol/operation/configure";
+                       providerId = APPCONTROL_PROVIDER_ID_EMAIL;
                }
                break;
 
        case ID_ITEM_APPLICATIONS_CONTACTS:
                {
-                       providerId = L"tizen.contacts";
-                       operationId = L"http://tizen.org/appcontrol/operation/configure";
+                       providerId = APPCONTROL_PROVIDER_ID_CONTACTS;
                }
                break;
 
        case ID_ITEM_APPLICATIONS_CALENDAR:
                {
-                       providerId = L"tizen.calendar";
-                       operationId = L"http://tizen.org/appcontrol/operation/configure";
+                       providerId = APPCONTROL_PROVIDER_ID_CALENDAR;
                }
                break;
 
        case ID_ITEM_APPLICATIONS_GALLERY:
                {
-                       providerId = L"tizen.gallery";
-                       operationId = L"http://tizen.org/appcontrol/operation/configure";
+                       providerId = APPCONTROL_PROVIDER_ID_GALLERY;
                }
                break;
 
-#ifndef        DISPLAY_SETTING_MENU_FOR_R0
-       case ID_ITEM_APPLICATIONS_VOICERECODER:
-               {
-                       providerId = L"";
-                       operationId = L"";
-               }
+       default:
                break;
-#endif
        }
 
        if (providerId != L"")
index d7e07ac..ff57613 100644 (file)
@@ -32,14 +32,8 @@ using namespace Tizen::Ui::Scenes;
 
 static const int ID_GROUP_MEMORY_MAIN = 0;
 
-#ifdef DISPLAY_SETTING_MENU_FOR_R0
 static const int ID_GROUP_MEMORY_MAIN_ITEM_COUNT = 1;
 static const int ID_ITEM_MEMORY_MAIN_MEMORY_STATUS = 0;
-#else
-static const int ID_GROUP_MEMORY_MAIN_ITEM_COUNT = 2;
-static const int ID_ITEM_MEMORY_MAIN_DEFAULT_MEMORY = 0;
-static const int ID_ITEM_MEMORY_MAIN_MEMORY_STATUS = 1;
-#endif
 
 static const int ID_GROUP_COUNT = 1;
 
@@ -177,24 +171,9 @@ MemoryForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
 
        ItemTypeOneLine(itemRectangle);
 
-       switch (itemIndex)
+       if (itemIndex == ID_ITEM_MEMORY_MAIN_MEMORY_STATUS)
        {
-       case ID_ITEM_MEMORY_MAIN_MEMORY_STATUS:
-               {
-                       itemText = ResourceManager::GetString(L"IDS_ST_BODY_MEMORY_STATUS");
-               }
-               break;
-
-#ifndef DISPLAY_SETTING_MENU_FOR_R0
-       case ID_ITEM_MEMORY_MAIN_DEFAULT_MEMORY:
-               {
-                       itemText = ResourceManager::GetString(L"IDS_ST_BODY_DEFAULT_MEMORY");
-               }
-               break;
-#endif
-
-       default:
-               break;
+               itemText = ResourceManager::GetString(L"IDS_ST_BODY_MEMORY_STATUS");
        }
 
        TableViewItem* pItem = new (std::nothrow) TableViewItem();
@@ -249,24 +228,9 @@ MemoryForm::OnGroupedTableViewItemStateChanged(Tizen::Ui::Controls::GroupedTable
 
        AppLogDebug("group[%d] index[%d]", groupIndex, itemIndex);
 
-       switch (itemIndex)
+       if (itemIndex == ID_ITEM_MEMORY_MAIN_MEMORY_STATUS)
        {
-#ifndef DISPLAY_SETTING_MENU_FOR_R0
-       case ID_ITEM_MEMORY_MAIN_DEFAULT_MEMORY:
-               {
-                       // TODO: add default memory scene
-               }
-               break;
-#endif
-
-       case ID_ITEM_MEMORY_MAIN_MEMORY_STATUS:
-               {
-                       pSceneManager->GoForward(ForwardSceneTransition(IDSCN_MEMORY_STATUS, SCENE_TRANSITION_ANIMATION_TYPE_LEFT));
-               }
-               break;
-
-       default:
-               break;
+               pSceneManager->GoForward(ForwardSceneTransition(IDSCN_MEMORY_STATUS, SCENE_TRANSITION_ANIMATION_TYPE_LEFT));
        }
 }
 
index 946a90f..be003a4 100644 (file)
@@ -33,24 +33,9 @@ using namespace Tizen::Ui;
 using namespace Tizen::Ui::Controls;
 using namespace Tizen::Ui::Scenes;
 
-#ifdef DISPLAY_SETTING_MENU_FOR_R0
 static const int ID_GROUP_MEMORY_STATUS_MAIN = 0;
 
 static const int ID_GROUP_COUNT = 1;
-#else
-static const int ID_GROUP_MEMORY_STATUS_MAIN = 0;
-static const int ID_GROUP_MEMORY_STATUS_MAIN_ITEM_COUNT = 4;
-static const int ID_ITEM_TOTAL_SPACE = 0;
-static const int ID_ITEM_AVAILABLE_SPACE = 1;
-static const int ID_ITEM_MOUNT_SDCARD = 2;
-static const int ID_ITEM_FORMAT_SDCARD = 3;
-
-static const int ID_GROUP_MEMORY_STATUS_STORAGE = 1;
-static const int ID_GROUP_MEMORY_STATUS_STORAGE_ITEM_COUNT = 1;
-static const int ID_ITEM_STORAGE_AVAILABLE_SPACE = 0;
-
-static const int ID_GROUP_COUNT = 2;
-#endif
 
 static const int GROUP_TOTAL_ITEM_COUNT_DEFAULT = 1;
 static const int GROUP_TOTAL_ITEM_COUNT_MAX = 2;
@@ -184,24 +169,9 @@ MemoryStatusForm::CreateGroupItem(int groupIndex, int itemWidth)
        String groupText;
        Label* pLabel = null;
 
-       switch (groupIndex)
+       if (groupIndex == ID_GROUP_MEMORY_STATUS_MAIN)
        {
-       case ID_GROUP_MEMORY_STATUS_MAIN:
-               {
-                       groupText = ResourceManager::GetString(L"IDS_ST_BODY_SD_CARD");
-               }
-               break;
-
-#ifndef DISPLAY_SETTING_MENU_FOR_R0
-       case ID_GROUP_MEMORY_STATUS_STORAGE:
-               {
-                       groupText = ResourceManager::GetString(L"IDS_ST_BODY_SYSTEM_STORAGE");
-               }
-               break;
-#endif
-
-       default:
-               break;
+               groupText = ResourceManager::GetString(L"IDS_ST_BODY_SD_CARD");
        }
 
        TableViewGroupItem* pItem = new (std::nothrow) TableViewGroupItem();
@@ -302,34 +272,12 @@ MemoryStatusForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                                }
                                break;
 
-#ifndef DISPLAY_SETTING_MENU_FOR_R0
-                       case ID_ITEM_TOTAL_SPACE:
-                               {
-                                       itemText = ResourceManager::GetString(L"IDS_ST_BODY_TOTAL_SPACE");
-                               }
-                               break;
-
-                       case ID_ITEM_AVAILABLE_SPACE:
-                               {
-                                       itemText = ResourceManager::GetString(L"IDS_ST_BODY_AVAILABLE_SPACE");
-                               }
-                               break;
-#endif
-
                        default:
                                break;
                        }
                }
                break;
 
-#ifndef DISPLAY_SETTING_MENU_FOR_R0
-       case ID_GROUP_MEMORY_STATUS_STORAGE:
-               {
-                       itemText = ResourceManager::GetString(L"IDS_ST_BODY_AVAILABLE_SPACE");
-               }
-               break;
-#endif
-
        default:
                break;
        }
index 6a0504f..8f0b929 100644 (file)
@@ -33,21 +33,14 @@ using namespace Tizen::Ui;
 using namespace Tizen::Ui::Controls;
 using namespace Tizen::Ui::Scenes;
 
-static const int ID_GROUP_CONNECTIVITY = 0;
-#ifdef DISPLAY_SETTING_MENU_FOR_R0
 static const int ID_GROUP_CONNECTIVITY_ITEM_COUNT = 1;
-#else
-static const int ID_GROUP_CONNECTIVITY_ITEM_COUNT = 2;
-#endif
 static const int ID_ITEM_CONNECTIVITY_BLUETOOTH = 0;
 static const int ID_ITEM_CONNECTIVITY_WIFI_DIRECT = 1;
 
 static const int ID_GROUP_COUNT = 1;
 static const int ID_GROUP_MAX_ITEM_COUNT = ID_GROUP_CONNECTIVITY_ITEM_COUNT;
 
-static const int BLUETOOTH_ON_OFF_OPTION = 2;
 static const int BLUETOOTH_OFF_OPTION = 0;
-static const int BLUETOOTH_ON_OPTION = 1;
 
 MoreConnectivityForm::MoreConnectivityForm(void)
 {
index 7114808..b06d8f0 100644 (file)
@@ -33,7 +33,6 @@ using namespace Tizen::Ui::Controls;
 using namespace Tizen::Ui::Scenes;
 
 static const int ID_GROUP_SYSTEM = 0;
-#ifdef DISPLAY_SETTING_MENU_FOR_R0
 static const int ID_GROUP_SYSTEM_ITEM_COUNT = 8;
 static const int ID_ITEM_SYSTEM_FONT = 0;
 static const int ID_ITEM_SYSTEM_AUTO_ROTATE_SCREEN = 1;
@@ -43,22 +42,7 @@ static const int ID_ITEM_SYSTEM_KEYBOARD = 4;
 static const int ID_ITEM_SYSTEM_MANAGE_APPLICATION = 5;
 static const int ID_ITEM_SYSTEM_DEVELOPER_OPTIONS = 6;
 static const int ID_ITEM_SYSTEM_ABOUT_PHONE = 7;
-#else
-static const int ID_GROUP_SYSTEM_ITEM_COUNT = 13;
-static const int ID_ITEM_SYSTEM_FONT = 0;
-static const int ID_ITEM_SYSTEM_DISPLAY = 1;
-static const int ID_ITEM_SYSTEM_HOME_SCREEN = 2;
-static const int ID_ITEM_SYSTEM_AUTO_ROTATE_SCREEN = 3;
-static const int ID_ITEM_SYSTEM_DATE_AND_TIME = 4;
-static const int ID_ITEM_SYSTEM_LANGUAGE_AND_REGION = 5;
-static const int ID_ITEM_SYSTEM_KEYBOARD = 6;
-static const int ID_ITEM_SYSTEM_STORAGE = 7;
-static const int ID_ITEM_SYSTEM_MANAGE_APPLICATIONS = 8;
-static const int ID_ITEM_SYSTEM_MEMORY = 9;
-static const int ID_ITEM_SYSTEM_RESET = 10;
-static const int ID_ITEM_SYSTEM_DEVELOPER_OPTIONS = 11;
-static const int ID_ITEM_SYSTEM_ABOUT_PHONE = 12;
-#endif
+
 static const int ID_GROUP_COUNT = 1;
 static const int ID_GROUP_MAX_ITEM_COUNT = ID_GROUP_SYSTEM_ITEM_COUNT;
 
@@ -245,15 +229,6 @@ MoreSystemForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                }
                break;
 
-#ifndef DISPLAY_SETTING_MENU_FOR_R0
-       case ID_ITEM_SYSTEM_MEMORY:
-               {
-                       itemText = ResourceManager::GetString(L"IDS_ST_BODY_STORAGE");
-                       pBitmap = ResourceManager::GetBitmapN(IDB_STORAGE);
-               }
-               break;
-#endif
-
        case ID_ITEM_SYSTEM_MANAGE_APPLICATION:
                {
                        pBitmap = ResourceManager::GetBitmapN(IDB_MANAGE_APPLICATION);
@@ -272,43 +247,6 @@ MoreSystemForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                }
                break;
 
-#ifndef DISPLAY_SETTING_MENU_FOR_R0
-       case ID_ITEM_SYSTEM_DISPLAY:
-               {
-                       pBitmap = ResourceManager::GetBitmapN(IDB_DISPLAY);
-                       itemText = ResourceManager::GetString(L"IDS_ST_BODY_DISPLAY");
-               }
-               break;
-
-       case ID_ITEM_SYSTEM_HOME_SCREEN:
-               {
-                       pBitmap = ResourceManager::GetBitmapN(IDB_AUTO_ROTATE_SCREEN);
-                       itemText = ResourceManager::GetString(L"IDS_ST_HEADER_HOME_SCREEN");
-               }
-               break;
-
-       case ID_ITEM_SYSTEM_STORAGE:
-               {
-                       pBitmap = ResourceManager::GetBitmapN(IDB_STORAGE);
-                       itemText = ResourceManager::GetString(L"IDS_ST_BODY_STORAGE");
-               }
-               break;
-
-       case ID_ITEM_SYSTEM_MANAGE_APPLICATIONS:
-               {
-                       pBitmap = ResourceManager::GetBitmapN(IDB_MANAGE_APPLICATION);
-                       itemText = ResourceManager::GetString(L"IDS_ST_BODY_MANAGE_APPLICATIONS");
-               }
-               break;
-
-       case ID_ITEM_SYSTEM_RESET:
-               {
-                       pBitmap = ResourceManager::GetBitmapN(IDB_RESET);
-                       itemText = ResourceManager::GetString(L"IDS_ST_BODY_RESET");
-               }
-               break;
-#endif
-
        default:
                break;
        }
@@ -446,35 +384,6 @@ MoreSystemForm::OnGroupedTableViewItemStateChanged(Tizen::Ui::Controls::GroupedT
                }
                break;
 
-#ifndef DISPLAY_SETTING_MENU_FOR_R0
-       case ID_ITEM_SYSTEM_DISPLAY:
-               {
-                       pSceneName = IDSCN_DISPLAY;
-               }
-               break;
-
-       case ID_ITEM_SYSTEM_HOME_SCREEN:
-               break;
-
-       case ID_ITEM_SYSTEM_STORAGE:
-               break;
-
-       case ID_ITEM_SYSTEM_MANAGE_APPLICATIONS:
-               break;
-
-       case ID_ITEM_SYSTEM_RESET:
-               {
-                       pSceneName = IDSCN_RESETTER;
-               }
-               break;
-
-       case ID_ITEM_SYSTEM_MEMORY:
-               {
-                       pSceneName = IDSCN_MEMORY;
-               }
-               break;
-#endif
-
        case ID_ITEM_SYSTEM_MANAGE_APPLICATION:
                {
                        pSceneName = IDSCN_MANAGE_APPLICATION;
index 1e1a5bb..6aad721 100644 (file)
@@ -37,18 +37,10 @@ static const int ID_ITEM_USE_PACKET_DATA = 0;
 
 static const int ID_GROUP_DATA_ROAMING = 1;
 static const int ID_GROUP_DATA_ROAMING_ITEM_COUNT = 1;
-static const int ID_ITEM_DATA_ROAMING = 0;
 
-#ifdef DISPLAY_SETTING_MENU_FOR_R0
 static const int ID_GROUP_NETWORK = 2;
 static const int ID_GROUP_NETWORK_ITEM_COUNT = 1;
 static const int ID_ITEM_NETWORK_NETWORK_MODE = 0;
-#else
-static const int ID_GROUP_NETWORK = 2;
-static const int ID_GROUP_NETWORK_ITEM_COUNT = 2;
-static const int ID_ITEM_NETWORK_SELECT_NETWORK = 0;
-static const int ID_ITEM_NETWORK_NETWORK_MODE = 1;
-#endif
 
 static const int ID_GROUP_NETWORK_MODE_SUB = 3;
 static const int ID_GROUP_NETWORK_MODE_SUB_ITEM_COUNT = 3;
@@ -57,16 +49,8 @@ static const int ID_ITEM_NETWORK_NETWORK_MODE_GSM_ONLY = 1;
 static const int ID_ITEM_NETWORK_NETWORK_MODE_WCDMA_ONLY = 2;
 
 static const int ID_GROUP_NETWORK_CONNECTIONS = 4;
-static const int ID_GROUP_NETWORK_CONNECTIONS_ITEM_COUNT = 1;
-static const int ID_ITEM_CONNECTION = 0;
 
-#ifdef DISPLAY_SETTING_MENU_FOR_R0
 static const int ID_GROUP_COUNT = 2;
-static const int ID_GROUP_MAX_ITEM_COUNT = 1;
-#else
-static const int ID_GROUP_COUNT = 5;
-static const int ID_GROUP_MAX_ITEM_COUNT = ID_GROUP_NETWORK_MODE_SUB_ITEM_COUNT;
-#endif
 
 static const int W_RESIZE_LABEL_GAP = 170;
 static const int RELATIVE_LAYOUT_RIGHT_MARGIN_ONOFF_SLIDING = 140;
@@ -330,24 +314,9 @@ NetworkForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
 
        case ID_GROUP_NETWORK:
        {
-               switch (itemIndex)
+               if (itemIndex == ID_ITEM_NETWORK_NETWORK_MODE)
                {
-               case ID_ITEM_NETWORK_NETWORK_MODE:
-                       {
-                               itemText = ResourceManager::GetString(L"IDS_ST_BODY_NETWORK_MODE");
-                       }
-                       break;
-
-#ifndef DISPLAY_SETTING_MENU_FOR_R0
-               case ID_ITEM_NETWORK_SELECT_NETWORK:
-                       {
-                               itemText = ResourceManager::GetString(L"IDS_ST_BODY_SELECT_NETWORK");
-                       }
-                       break;
-#endif
-
-               default:
-                       break;
+                       itemText = ResourceManager::GetString(L"IDS_ST_BODY_NETWORK_MODE");
                }
        }
        break;
index 5580794..6c37fa8 100644 (file)
@@ -41,31 +41,19 @@ static const int ID_ITEM_MAIN_VIBRATION = 1;
 
 static const int ID_GROUP_VOLUME = 1;
 
-#ifdef DISPLAY_SETTING_MENU_FOR_R0
 static const int ID_GROUP_VOLUME_ITEM_COUNT = 1;
 static const int ID_ITEM_VOLUME_SYSTEM = 0;
-#else
-static const int ID_GROUP_VOLUME_ITEM_COUNT = 4;
-static const int ID_ITEM_VOLUME_INCOMMING_CALL = 0;
-static const int ID_ITEM_VOLUME_NOTIFICATION = 1;
-static const int ID_ITEM_VOLUME_MEDIA = 2;
-static const int ID_ITEM_VOLUME_SYSTEM = 3;
-#endif
 
 static const int ID_GROUP_VIBRATION = 2;
 static const int ID_GROUP_VIBRATION_ITEM_COUNT = 2;
 static const int ID_ITEM_VIBRATION_NOTIFICATION = 0;
 static const int ID_ITEM_VIBRATION_HAPTIC_FEEDBACK = 1;
 
-static const int ID_GROUP_INFORMATION = 3;
-
 static const int ID_GROUP_INCOMMING_CALL = 0;
-static const int ID_GROUP_INCOMMING_CALL_ITEM_COUNT = 2;
 static const int ID_ITEM_INCOMMING_CALL_RINGTONE = 0;
 static const int ID_ITEM_INCOMMING_CALL_VIBRATION = 1;
 
 static const int ID_GROUP_NOTIFICATION = 1;
-static const int ID_GROUP_NOTIFICATION_ITEM_COUNT = 4;
 static const int ID_ITEM_NOTIFICATION_MESSAGE_ALERT = 0;
 static const int ID_ITEM_NOTIFICATION_MESSAGE_ALERT_REPETITION = 1;
 static const int ID_ITEM_NOTIFICATION_EMAIL_ALERT = 2;
@@ -73,57 +61,26 @@ static const int ID_ITEM_NOTIFICATION_EMAIL_ALERT_REPETITION = 3;
 
 static const int ID_GROUP_SCREEN_LOCK_SOUND = 2;
 static const int ID_GROUP_SCREEN_LOCK_SOUND_ITEM_COUNT = 1;
-static const int ID_ITEM_RINGTONE_SCREEN_LOCK_SOUND = 0;
-
-static const int ID_GROUP_MAX_COUNT = 4;
-static const int ID_GROUP_MAX_ITEM_COUNT = ID_GROUP_VOLUME_ITEM_COUNT;
 
-#ifdef DISPLAY_SETTING_MENU_FOR_R0
 static const int ID_VOLUME_PAGE_GROUP_COUNT = 2;
-#else
-static const int ID_VOLUME_PAGE_GROUP_COUNT = 4;
-#endif
 static const int ID_RINGTONE_PAGE_GROUP_COUNT = 3;
 
 static const int ID_GROUP1 = 0;
-static const int ID_GROUP1_INDEX1 = 0;
-static const int ID_GROUP1_INDEX2 = 1;
-
 static const int ID_GROUP2 = 1;
-static const int ID_GROUP2_INDEX1 = 0;
-static const int ID_GROUP2_INDEX2 = 1;
-static const int ID_GROUP2_INDEX3 = 2;
-static const int ID_GROUP2_INDEX4 = 3;
-
 static const int ID_GROUP3 = 2;
-static const int ID_GROUP3_INDEX1 = 0;
-static const int ID_GROUP3_INDEX2 = 1;
-
 static const int ID_GROUP4 = 3;
 
+static const int ID_GROUP2_INDEX1 = 0;
+
 static const int ID_SOUND_VOLUME_PAGE = 1;
 static const int ID_SOUND_RINGTONE_PAGE = 2;
 
-static const int Y_GROUP_ITEM_SLIDER = 0;
 static const int GROUP_ITEM_SLIDER_MIN_VALUE = 0;
 static const int GROUP_ITEM_SLIDER_MAX_VALUE = 15;
 static const int GROUP_ITEM_SLIDER_DEFAULT_VALUE = 5;
 
-static const int X_GROUP_ITEM_SOUND_MIN = 10;
-static const int X_GROUP_ITEM_SOUND_MAX = 630;
-static const int Y_GROUP_ITEM_SOUND = 65;
-static const int W_GROUP_ITEM_SOUND = 45;
-static const int H_GROUP_ITEM_SOUND = 45;
-
-static const int X_GROUP_ITEM_SOUND_LABEL = 35;
 static const int STRING_SIZE_LIMIT = 20;
 
-static const int X_PORTRAIT_BUTTON_POSITION = 665;
-static const int X_LANDSCAPE_BUTTON_POSITION = 1200;
-
-static const int DIVED_BY_TEN = 10;
-static const int MULTI_BY_NINE = 9;
-
 SoundsForm::SoundsForm(void)
        : __currentTableViewList(ID_SOUND_VOLUME_PAGE)
 {
@@ -143,16 +100,8 @@ SoundsForm::CreateHeader(void)
        HeaderItem headerItemVolume;
        headerItemVolume.Construct(IDA_HEADER_VOLUME);
        headerItemVolume.SetText(ResourceManager::GetString(L"IDS_ST_BODY_VOLUME"));
-#ifndef DISPLAY_SETTING_MENU_FOR_R0
-       HeaderItem headerItemRingtone;
-       headerItemRingtone.Construct(IDA_HEADER_RINGTONE);
-       headerItemRingtone.SetText(ResourceManager::GetString(L"IDS_COM_BODY_RINGTONES"));
-#endif
 
        pHeader->AddItem(headerItemVolume);
-#ifndef DISPLAY_SETTING_MENU_FOR_R0
-       pHeader->AddItem(headerItemRingtone);
-#endif
        pHeader->AddActionEventListener(*this);
 }
 
@@ -172,11 +121,7 @@ SoundsForm::CreateFooter(void)
 result
 SoundsForm::OnInitializing(void)
 {
-#ifndef DISPLAY_SETTING_MENU_FOR_R0
-       CreateHeader();
-#else
        BaseForm::CreateHeader(ResourceManager::GetString(L"IDS_ST_BODY_SOUNDS"));
-#endif
        CreateFooter();
        CreateTableView();
 
@@ -544,42 +489,16 @@ SoundsForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                        String sliderItemName;
                        sliderItemName.Format(STRING_SIZE_LIMIT, L"volumeItem_%d", itemIndex);
 
-                       switch (itemIndex)
+                       if (itemIndex == ID_ITEM_VOLUME_SYSTEM)
                        {
-#ifndef DISPLAY_SETTING_MENU_FOR_R0
-                       case ID_ITEM_VOLUME_INCOMMING_CALL:
-                               {
-                                       itemText = ResourceManager::GetString(L"IDS_ST_BODY_INCOMMING_CALL");
-                               }
-                               break;
-
-                       case ID_ITEM_VOLUME_NOTIFICATION:
-                               {
-                                       itemText = ResourceManager::GetString(L"IDS_ST_BODY_NOTIFICATION");
-                               }
-                               break;
-
-                       case ID_ITEM_VOLUME_MEDIA:
-                               {
-                                       itemText = ResourceManager::GetString(L"IDS_COM_BODY_MEDIA");
-                               }
-                               break;
-#endif
-                       case ID_ITEM_VOLUME_SYSTEM:
-                               {
-                                       itemText = ResourceManager::GetString(L"IDS_ST_BODY_SYSTEM");
-                               }
-                               break;
-
-                       default:
-                               break;
+                               itemText = ResourceManager::GetString(L"IDS_ST_BODY_SYSTEM");
                        }
 
                        pSlider = new (std::nothrow) Slider();
 
                        pSlider->Construct(itemRectSlider, BACKGROUND_STYLE_NONE, true, GROUP_ITEM_SLIDER_MIN_VALUE, GROUP_ITEM_SLIDER_MAX_VALUE);
                        pSlider->SetTitleText(itemText);
-#ifdef DISPLAY_SETTING_MENU_FOR_R0
+
                        int systemVolume = 0;
                        if (SettingInfo::GetValue(SETTING_INFO_KEY_SOUND_SYSTEM_VOLUME, systemVolume) != E_SUCCESS)
                        {
@@ -590,9 +509,6 @@ SoundsForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                        {
                                pSlider->SetValue(systemVolume);
                        }
-#else
-                       pSlider->SetValue(GROUP_ITEM_SLIDER_DEFAULT_VALUE);
-#endif
 
                        pBitmapSoundMin = ResourceManager::GetBitmapN(IDB_SOUND_MIN);
                        pBitmapSoundMax = ResourceManager::GetBitmapN(IDB_SOUND_MAX);
@@ -912,17 +828,10 @@ SoundsForm::OnAdjustmentValueChanged(const Tizen::Ui::Control& source, int adjus
 
        if (sourceName == L"volumeItem_0")
        {
-#ifdef DISPLAY_SETTING_MENU_FOR_R0
                if (SettingInfo::SetValue(SETTING_INFO_KEY_SOUND_SYSTEM_VOLUME, adjustment) != E_SUCCESS)
                {
                        AppLogDebug("Set system volume fail... - %s", GetErrorMessage(GetLastResult()));
                }
-#else
-               if (SettingInfo::SetVolume (SETTING_INFO_KEY_SOUND_RINGTONE_VOLUME, adjustment) != E_SUCCESS)
-               {
-                       AppLogDebug("RingtoneSoundVolume  Fail..  - %s", GetErrorMessage(GetLastResult()));
-               }
-#endif
        }
        else if (sourceName == L"volumeItem_1")
        {
@@ -961,45 +870,6 @@ SoundsForm::OnAdjustmentValueChanged(const Tizen::Ui::Control& source, int adjus
        AppLogDebug("control by name[%ls]", sourceName.GetPointer());
 }
 
-void
-SoundsForm::OnSliderBarMoved(Tizen::Ui::Controls::Slider& source, int value)
-{
-#ifndef DISPLAY_SETTING_MENU_FOR_R0
-       String sourceName(source.GetName());
-
-       if (sourceName == L"volumeItem_0")
-       {
-               // TODO: Incomming Call Volume Control.
-       }
-       else if (sourceName == L"volumeItem_1")
-       {
-               // TODO: Notification Volume Control.
-       }
-       else if (sourceName == L"volumeItem_2")
-       {
-               // TODO: Media Volume Control.
-       }
-       else if (sourceName == L"volumeItem_3")
-       {
-               // TODO: System Volume Control.
-       }
-       else if (sourceName == L"vibrationItem_0")
-       {
-               // TODO: Notification Vibration Control.
-       }
-       else if (sourceName == L"vibrationItem_1")
-       {
-               // TODO: Haptic feedback Vibration Control.
-       }
-       else
-       {
-               // Empty statement
-       }
-
-       AppLogDebug("coltrol by name[%ls]", sourceName.GetPointer());
-#endif
-}
-
 void 
 SoundsForm::GroupItemEnable(int itemIndex, bool enableStatus)
 {
index 1de84a3..6bc97a1 100644 (file)
@@ -169,7 +169,9 @@ const int TWO_LINE_ITEM_WIDTH_GAP = 80;
 const int ICON_AND_ONE_LINE_ITEM_WIDTH_GAP = 170;
 
 const int RELATIVE_LAYOUT_RIGHT_MARGIN = 20;
+const int RELATIVE_LAYOUT_RIGHT_MARGIN_DETAIL_ARROW_BUTTON = 30;
 const int RELATIVE_LAYOUT_LEFT_MARGIN = 116;
+const int W_DETAIL_ARROW_BUTTON = 72;
 
 const int FRFRESH_REQUEST_EVENT = 9999;
 
@@ -264,6 +266,8 @@ const wchar_t* IDB_WIFI_RSSI_UNLOCK_00 = L"A01-3_Wifi_unlock_icon_00.png";
 const wchar_t* IDB_WIFI_RSSI_UNLOCK_01 = L"A01-3_Wifi_unlock_icon_01.png";
 const wchar_t* IDB_WIFI_RSSI_UNLOCK_02 = L"A01-3_Wifi_unlock_icon_02.png";
 const wchar_t* IDB_WIFI_RSSI_UNLOCK_03 = L"A01-3_Wifi_unlock_icon_03.png";
+const wchar_t* IDB_DETAIL_BUTTON_EXPAND_OPENED = L"00_button_expand_opened.png";
+const wchar_t* IDB_DETAIL_BUTTON_EXPAND_CLOSED = L"00_button_expand_closed.png";
 
 //ETC not using now.
 const wchar_t* IDB_POWER_SAVING_MODE = L"settings_74_power_saving_mode.png";