Apply 2.1 appcontrol spec and modified ui guide contents
authorTaeHo Choi <thanks.choi@samsung.com>
Fri, 29 Mar 2013 08:22:24 +0000 (17:22 +0900)
committerTaeHo Choi <thanks.choi@samsung.com>
Fri, 29 Mar 2013 08:32:03 +0000 (17:32 +0900)
Change-Id: I64a64d5f18ef22b4ed06fbf4a284975eefc8f0e3
Signed-off-by: TaeHo Choi <thanks.choi@samsung.com>
16 files changed:
inc/StBluetoothForm.h
inc/StFontForm.h
inc/StLocationForm.h
inc/StMainMenuForm.h
inc/StTypes.h
res/screen-density-xhigh/A01-1_icon_Wallpaper.png [deleted file]
res/screen-density-xhigh/settings_106_lockscreen.png [new file with mode: 0644]
res/screen-density-xhigh/settings_106_nfc.png [new file with mode: 0644]
res/screen-density-xhigh/settings_106_wallpaper.png [new file with mode: 0644]
src/StBluetoothForm.cpp
src/StFontForm.cpp
src/StLocationForm.cpp
src/StMainMenuForm.cpp
src/StMoreConnectivityForm.cpp
src/StSettingsApp.cpp
src/StTypes.cpp

index e7f6ba3..229c7bf 100644 (file)
@@ -109,7 +109,7 @@ private:
        int __groupItemCount[ID_GROUP_TOTAL_COUNT];
        int __groupIndexTranslateTable[ID_TRANSLATE_TABLE_MAX];
        bool __isVisibleGroupExpanded;
-       bool __isAppControlRequest;
+       char __isAppControlRequest;
        Tizen::Base::String __categoryCheck;
 };
 
index 9ad2149..ce4208f 100644 (file)
@@ -34,8 +34,8 @@ public:
        virtual ~FontForm(void);
 
        void CreateFooter(void);
-       void SetAppControlRequest(bool requestStatus);
-       bool GetAppControlRequest(void);
+       void SetAppControlRequest(char requestStatus);
+       char GetAppControlRequest(void);
        void AppControlFontResult(void);
        result GetFontList(Tizen::Base::Collection::IList& list);
        virtual result OnInitializing(void);
@@ -65,7 +65,7 @@ private:
        void GetTableViewItemString(int groupIndex, int itemIndex, Tizen::Base::String& firstLine, Tizen::Base::String& secondLine);
 
 private:
-       bool __isAppControlRequest;
+       char __isAppControlRequest;
        Tizen::Base::String __categoryCheck;
        Tizen::Base::Collection::ArrayList* __fontList;
        bool __isFontTypeExpend;
index 17c9836..fea215c 100644 (file)
@@ -59,7 +59,7 @@ public:
        virtual void OnActionPerformed(const Tizen::Ui::Control& source, int actionId);
 
 private:
-       bool __isAppControlRequest;
+       char __isAppControlRequest;
        Tizen::Base::String __categoryCheck;
 };
 
index 0b6ae88..011673b 100644 (file)
@@ -94,14 +94,12 @@ private:
        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);
        const wchar_t* GroupSystemSceneConnect(int viewMode, int itemIndex, Tizen::Ui::Controls::TableViewItemStatus status);
-       const wchar_t* GroupApplicationSceneConnect(int index);
 
 private:
        int __currentTableViewList;
        Tizen::Base::Collection::IList* __pDownloadAppIdKeyList;
        Tizen::Base::Collection::HashMap* __pAppIdHashMap;
        Tizen::Base::Collection::HashMap* __pAppIconPathHashMap;
-       Tizen::Ui::Controls::FooterItem __footerViewType;
        Tizen::System::ISettingInfoSetValueAsyncResultListener* __pFlightModeSetValueAsyncResultListener;
 };
 
index c3a6af7..36d6d07 100644 (file)
@@ -192,9 +192,11 @@ extern const wchar_t* IDB_LOCATION;
 extern const wchar_t* IDB_NETWORK;
 extern const wchar_t* IDB_BLUETOOTH;
 extern const wchar_t* IDB_WIFI_DIRECT;
+extern const wchar_t* IDB_NFC;
 //System
 extern const wchar_t* IDB_EVENT_NOTIFICATION;
 extern const wchar_t* IDB_WALLPAPER;
+extern const wchar_t* IDB_LOCK_SCREEN;
 extern const wchar_t* IDB_SOUND;
 extern const wchar_t* IDB_BRIGHTNESS;
 extern const wchar_t* IDB_SECURITY;
diff --git a/res/screen-density-xhigh/A01-1_icon_Wallpaper.png b/res/screen-density-xhigh/A01-1_icon_Wallpaper.png
deleted file mode 100644 (file)
index de68128..0000000
Binary files a/res/screen-density-xhigh/A01-1_icon_Wallpaper.png and /dev/null differ
diff --git a/res/screen-density-xhigh/settings_106_lockscreen.png b/res/screen-density-xhigh/settings_106_lockscreen.png
new file mode 100644 (file)
index 0000000..c280cee
Binary files /dev/null and b/res/screen-density-xhigh/settings_106_lockscreen.png differ
diff --git a/res/screen-density-xhigh/settings_106_nfc.png b/res/screen-density-xhigh/settings_106_nfc.png
new file mode 100644 (file)
index 0000000..b3a6200
Binary files /dev/null and b/res/screen-density-xhigh/settings_106_nfc.png differ
diff --git a/res/screen-density-xhigh/settings_106_wallpaper.png b/res/screen-density-xhigh/settings_106_wallpaper.png
new file mode 100644 (file)
index 0000000..9d80377
Binary files /dev/null and b/res/screen-density-xhigh/settings_106_wallpaper.png differ
index 36f9604..04de8cd 100644 (file)
@@ -37,6 +37,9 @@ using namespace Tizen::Ui::Scenes;
 
 #define BLUETOOTH_TEST_CODE
 
+static const char APPCONTROL_REQUEST_DEFAULT = 0x00;
+static const char APPCONTROL_REQUEST_BLUETOOTH = 0x20;
+
 static const int ID_BLUETOOTH_COUNT_DEFAULT = 1;
 static const int ID_BLUETOOTH_TABLEVIEW_ITEM_SPECIFIED_INPUT_PARMETER = -1;
 static const int ID_FOOTER_ITEM_INDEX_1 = 0;
@@ -90,7 +93,7 @@ BluetoothForm::BluetoothForm(void)
        , __pPendingEventReceivedForm(null)
        , __pAnimationFrameList(null)
        , __isVisibleGroupExpanded(false)
-       , __isAppControlRequest(false)
+       , __isAppControlRequest(APPCONTROL_REQUEST_DEFAULT)
        , __categoryCheck(L"")
 {
        InitStateChangedTabviewItemTag();
@@ -184,9 +187,10 @@ BluetoothForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousScene
                if (pArgs != null)
                {
                        __categoryCheck = static_cast<String*>(pArgs->GetAt(0))->GetPointer();
-                       if (__categoryCheck == L"category:Bluetooth.Visibility")
+
+                       if (__categoryCheck.CompareTo(L"http://tizen.org/appcontrol/data/bluetooth/visibility") == 0)
                        {
-                               __isAppControlRequest = true;
+                               __isAppControlRequest = APPCONTROL_REQUEST_BLUETOOTH;
                        }
                        delete pArgs;
                        pArgs = null;
@@ -205,9 +209,10 @@ BluetoothForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousScene
        else if (pArgs != null)
        {
                __categoryCheck = static_cast<String*>(pArgs->GetAt(0))->GetPointer();
-               if (__categoryCheck == L"category:Bluetooth.Visibility")
+
+               if (__categoryCheck.CompareTo(L"http://tizen.org/appcontrol/data/bluetooth/visibility") == 0)
                {
-                       __isAppControlRequest = true;
+                       __isAppControlRequest = APPCONTROL_REQUEST_BLUETOOTH;
                }
                delete pArgs;
                pArgs = null;
@@ -233,7 +238,7 @@ BluetoothForm::OnFormBackRequested(Tizen::Ui::Controls::Form& source)
                __pBluetoothPresentationModelInstance->CancelBluetoothDiscovery();
        }
 
-       if (__isAppControlRequest == true)
+       if (__isAppControlRequest != APPCONTROL_REQUEST_DEFAULT)
        {
                UiApp* pApp = UiApp::GetInstance();
                AppAssert(pApp);
@@ -1576,13 +1581,10 @@ BluetoothForm::AppControlBluetoothResult(void)
        HashMap* hashMap = new (std::nothrow) HashMap();
        hashMap->Construct();
 
-       if (__categoryCheck == L"category:Bluetooth.Visibility")
+       if (__isAppControlRequest & APPCONTROL_REQUEST_BLUETOOTH)
        {
-               SettingInfo::GetValue(SETTING_INFO_KEY_FONT_TYPE, value);
-               hashMap->Add(*(new (std::nothrow) String(L"category")), *(new (std::nothrow) String(L"Bluetooth.Visibility")));
-               hashMap->Add(*(new (std::nothrow) String(L"visibility")), *(new (std::nothrow) String(L"Off")));
+               hashMap->Add(*(new (std::nothrow) String(L"http://tizen.org/appcontrol/data/bluetooth/visibility")), *(new (std::nothrow) String(L"Off")));
        }
-
        pAppManager->SendAppControlResult(reqId, APP_CTRL_RESULT_SUCCEEDED, hashMap);
 
        hashMap->RemoveAll();
index 6bd78ce..f5324a4 100644 (file)
@@ -36,6 +36,12 @@ using namespace Tizen::Ui;
 using namespace Tizen::Ui::Controls;
 using namespace Tizen::Ui::Scenes;
 
+static const char APPCONTROL_DEFAULT = 0x00;
+static const char APPCONTROL_REQUEST_FONT_TYPE = 0x21;
+static const char APPCONTROL_REQUEST_FONT_SIZE = 0x22;
+static const char APPCONTROL_TYPE = 0x01;
+static const char APPCONTROL_SIZE = 0x02;
+
 static const int W_FONT_ITEM_RIGHT_GAP = 100;
 static const int ID_GROUP_FONT = 0;
 static const int ID_GROUP_FONT_ITEM_COUNT = 1;
@@ -61,7 +67,7 @@ static const int DEVIDE_TWO = 2;
 static const int SECOND_CONTROL_ITEM = 1;
 
 FontForm::FontForm(void)
-       : __isAppControlRequest(false)
+       : __isAppControlRequest(APPCONTROL_DEFAULT)
        , __categoryCheck(L"")
        , __isFontTypeExpend(false)
 {
@@ -121,22 +127,20 @@ FontForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousSceneId, c
        {
                __categoryCheck = static_cast<String*>(pArgs->GetAt(0))->GetPointer();
 
-               if ((__categoryCheck == L"category:FontType") || (__categoryCheck == L"category:FontSize"))
+               if (__categoryCheck.CompareTo(L"http://tizen.org/appcontrol/data/font/type") == 0)
                {
-                       SetAppControlRequest(true);
-
-                       if (__categoryCheck.Equals(L"category:FontType", false))
-                       {
-                               __pTableView->SetItemEnabled(ID_GROUP_FONT_SIZE, ID_ITEM_FONT_SIZE, false);
-                       }
-                       else
-                       {
-                               __pTableView->SetItemEnabled(ID_GROUP_FONT, ID_ITEM_FONT_TYPE, false);
-                       }
+                       SetAppControlRequest(APPCONTROL_REQUEST_FONT_TYPE);
+                       __pTableView->SetItemEnabled(ID_GROUP_FONT_SIZE, ID_ITEM_FONT_SIZE, false);
                }
+               else if (__categoryCheck.Equals(L"http://tizen.org/appcontrol/data/font/size", false))
+               {
+                       SetAppControlRequest(APPCONTROL_REQUEST_FONT_SIZE);
+                       __pTableView->SetItemEnabled(ID_GROUP_FONT, ID_ITEM_FONT_TYPE, false);
+               }
+
                delete pArgs;
        }
-       __pTableView->Draw(true);
+       __pTableView->UpdateTableView();
 
        String currentFontType;
 
@@ -171,7 +175,7 @@ FontForm::OnFormBackRequested(Tizen::Ui::Controls::Form& source)
        AppAssert(pSceneManager);
 
        __pTableView->CollapseGroup(ID_GROUP_FONT_LIST);
-       if (GetAppControlRequest() == true)
+       if (GetAppControlRequest() != APPCONTROL_DEFAULT)
        {
                UiApp* pApp = UiApp::GetInstance();
                AppAssert(pApp);
@@ -313,6 +317,7 @@ FontForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
        int itemHeight = H_GROUP_ITEM_DEFAULT;
        Rectangle detailArrow;
        Bitmap* pBitmap = null;
+       char appControlRequest;
 
        if (groupIndex == ID_GROUP_FONT_LIST)
        {
@@ -403,9 +408,9 @@ FontForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);
        }
 
-       if (GetAppControlRequest() == true)
+       if ((appControlRequest = GetAppControlRequest()) != APPCONTROL_DEFAULT)
        {
-               if (__categoryCheck.Equals(L"category:FontType", false))
+               if (appControlRequest & APPCONTROL_TYPE)
                {
                        if (groupIndex == ID_GROUP_FONT_SIZE)
                        {
@@ -413,7 +418,7 @@ FontForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                                pItem = null;
                        }
                }
-               else if (__categoryCheck.Equals(L"category:FontSize", false))
+               else if (appControlRequest & APPCONTROL_SIZE)
                {
                        if ((groupIndex == ID_GROUP_FONT) || (groupIndex == ID_GROUP_FONT_LIST))
                        {
@@ -642,57 +647,24 @@ FontForm::AppControlFontResult(void)
        String value;
        AppControlProviderManager* pAppManager = AppControlProviderManager::GetInstance();
 
-#if 0
-       IList* pDefaultResultIList = null;
-       ArrayList* pDataList = null;
-
-       pDataList = new (std::nothrow) ArrayList();
-       pDataList->Construct();
-
-       pDataList->Add(*(new (std::nothrow) String(L"APPCONTROL_RESULT_SUCCEEDED")));
-       pDataList->Add(*(new (std::nothrow) String(__categoryCheck)));
-
-       if (__categoryCheck == L"category:FontType")
-       {
-               SettingInfo::GetValue(SETTING_INFO_KEY_FONT_TYPE, value);
-       }
-       else if (__categoryCheck == L"category:FontSize")
-       {
-               SettingInfo::GetValue(SETTING_INFO_KEY_FONT_SIZE, value);
-       }
-       pDataList->Add(*(new (std::nothrow) String(value)));
-
-       pDefaultResultIList = (pDataList->GetItemsN(0, pDataList->GetCount()));
-
-       pAppManager->SendAppControlResult(reqId, pDefaultResultIList);
-
-       pDataList->RemoveAll(true);
-       delete pDataList;
-       pDefaultResultIList->RemoveAll(true);
-       delete pDefaultResultIList;
-#else
        HashMap* hashMap = new (std::nothrow) HashMap();
        hashMap->Construct();
 
-       if (__categoryCheck == L"category:FontType")
+       if (GetAppControlRequest() == APPCONTROL_REQUEST_FONT_TYPE)
        {
                SettingInfo::GetValue(SETTING_INFO_KEY_FONT_TYPE, value);
-               hashMap->Add(*(new (std::nothrow) String(L"category")), *(new (std::nothrow) String(L"FontType")));
-               hashMap->Add(*(new (std::nothrow) String(L"type")), *(new (std::nothrow) String(value)));
-
+               hashMap->Add(*(new (std::nothrow) String(L"http://tizen.org/appcontrol/data/font/type")), *(new (std::nothrow) String(value)));
        }
-       else if (__categoryCheck == L"category:FontSize")
+       else if (GetAppControlRequest() == APPCONTROL_REQUEST_FONT_SIZE)
        {
                SettingInfo::GetValue(SETTING_INFO_KEY_FONT_SIZE, value);
-               hashMap->Add(*(new (std::nothrow) String(L"category")), *(new (std::nothrow) String(L"FontSize")));
-               hashMap->Add(*(new (std::nothrow) String(L"size")), *(new (std::nothrow) String(value)));
+               hashMap->Add(*(new (std::nothrow) String(L"http://tizen.org/appcontrol/data/font/size")), *(new (std::nothrow) String(value)));
        }
 
        pAppManager->SendAppControlResult(reqId, APP_CTRL_RESULT_SUCCEEDED, hashMap);
 
        hashMap->RemoveAll();
        delete hashMap;
-#endif
 }
 
 result
@@ -842,14 +814,14 @@ FontForm::OnSettingChanged (Tizen::Base::String &key)
        }
 }
 
-bool
+char
 FontForm::GetAppControlRequest(void)
 {
        return __isAppControlRequest;
 }
 
 void
-FontForm::SetAppControlRequest(bool requestStatus)
+FontForm::SetAppControlRequest(char requestStatus)
 {
        __isAppControlRequest = requestStatus;
 }
\ No newline at end of file
index eb4e53a..ffb8fe4 100644 (file)
@@ -1,4 +1,4 @@
-//
+//
 // Copyright (c) 2012 Samsung Electronics Co., Ltd.
 //
 // Licensed under the Flora License, Version 1.0 (the License);
@@ -33,6 +33,9 @@ using namespace Tizen::Ui;
 using namespace Tizen::Ui::Controls;
 using namespace Tizen::Ui::Scenes;
 
+static const char APPCONTROL_REQUEST_DEFAULT = 0x00;
+static const char APPCONTROL_REQUEST_LOCATION = 0x20;
+
 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;
@@ -52,7 +55,7 @@ static const int W_RESIZE_LABEL_GAP = 170;
 static const int RELATIVE_LAYOUT_RIGHT_MARGIN_ONOFF_SLIDING = 120;
 
 LocationForm::LocationForm(void)
-       : __isAppControlRequest(false)
+       : __isAppControlRequest(APPCONTROL_REQUEST_DEFAULT)
        , __categoryCheck(L"")
 {
 }
@@ -128,10 +131,15 @@ LocationForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousSceneI
        {
                __categoryCheck = static_cast<String*>(pArgs->GetAt(0))->GetPointer();
 
-               if (__categoryCheck == L"category:Location")
+               if (__categoryCheck.CompareTo(L"http://tizen.org/appcontrol/data/location/gps") == 0)
+               {
+                       __isAppControlRequest = APPCONTROL_REQUEST_LOCATION;
+               }
+               else if (__categoryCheck.CompareTo(L"http://tizen.org/appcontrol/data/location/wps") == 0)
                {
-                       __isAppControlRequest = true;
+                       __isAppControlRequest = APPCONTROL_REQUEST_LOCATION;
                }
+
                delete pArgs;
        }
 }
@@ -147,7 +155,7 @@ LocationForm::OnFormBackRequested(Tizen::Ui::Controls::Form& source)
        SceneManager* pSceneManager = SceneManager::GetInstance();
        AppAssert(pSceneManager);
 
-       if (__isAppControlRequest == true)
+       if (__isAppControlRequest != APPCONTROL_REQUEST_DEFAULT)
        {
                UiApp* pApp = UiApp::GetInstance();
                AppAssert(pApp);
@@ -515,7 +523,9 @@ LocationForm::AppControlLocationResult(void)
        HashMap* hashMap = new (std::nothrow) HashMap();
        hashMap->Construct();
 
-       if (__categoryCheck == L"category:Location")
+       if ((__categoryCheck.CompareTo(L"http://tizen.org/appcontrol/data/location/gps") == 0)
+               || (__categoryCheck.CompareTo(L"http://tizen.org/appcontrol/data/location/wps") == 0)
+               )
        {
                SettingInfo::GetValue(SETTING_INFO_KEY_LOCATION_GPS, gpsStatus);
                SettingInfo::GetValue(SETTING_INFO_KEY_LOCATION_WPS, wpsStatus);
@@ -531,7 +541,8 @@ LocationForm::AppControlLocationResult(void)
                {
                        status = L"GPSDisabled";
                }
-               hashMap->Add(*(new (std::nothrow) String(L"GPS")), *(new (std::nothrow) String(status)));
+
+               hashMap->Add(*(new (std::nothrow) String(L"http://tizen.org/appcontrol/data/location/gps")), *(new (std::nothrow) String(status)));
 
                if (wpsStatus == true)
                {
@@ -541,7 +552,8 @@ LocationForm::AppControlLocationResult(void)
                {
                        status = L"WPSDisabled";
                }
-               hashMap->Add(*(new (std::nothrow) String(L"WPS")), *(new (std::nothrow) String(status)));
+
+               hashMap->Add(*(new (std::nothrow) String(L"http://tizen.org/appcontrol/data/location/wps")), *(new (std::nothrow) String(status)));
        }
 
        pAppManager->SendAppControlResult(reqId, ResultValue, hashMap);
index 883cf4c..92679cd 100644 (file)
@@ -53,11 +53,6 @@ static const int MAIN_RELATIVE_LAYOUT_RIGHT_MARGIN = 60;
 
 static const wchar_t* APPCONTROL_OPERATION_ID_CONFIGURE = L"http://tizen.org/appcontrol/operation/configure";
 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";
 static const wchar_t* APPCONTROL_PROVIDER_ID_ACCOUNT = L"ZsnYtAdjl2.Account";
 
 static const wchar_t* ID_RELATIVE_SETTING_XML_FILE_PATH = L"/setting/setting.xml";
@@ -84,28 +79,19 @@ 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;
-static const int ID_ITEM_DEVICE_DATE_TIME = 3;
-static const int ID_ITEM_DEVICE_LANGUAGE_KEYBOARD = 4;
-static const int ID_GROUP_DEVICE_ITEM_COUNT = 5;
+static const int ID_ITEM_DEVICE_CALL_SETTING = 3;
+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 = 4;
 static const int ID_ITEM_SYSTEM_MANAGE_APPLICATION = 0;
-static const int ID_ITEM_SYSTEM_DEVELOPER_OPTION = 1;
-static const int ID_ITEM_SYSTEM_ABOUT_PHONE = 2;
-static const int ID_GROUP_SYSTEM_ITEM_COUNT = 3;
-
-static const int ID_GROUP_APPLICATION = 5;
-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;
-static const int ID_ITEM_APPLICATIONS_ACCOUNT = 6;
-static const int ID_GROUP_APPLICATIONS_ITEM_COUNT = 6;
-
-static const int ID_GROUP_APPSETTING = 6;
-static const int ID_GROUP_NO_APPSETTING = 6;
+static const int ID_ITEM_SYSTEM_DEVELOPER_OPTION = 2;
+static const int ID_ITEM_SYSTEM_ABOUT_PHONE = 1;
+static const int ID_GROUP_SYSTEM_ITEM_COUNT = 2;
+
+static const int ID_GROUP_APPSETTING = 5;
+static const int ID_GROUP_NO_APPSETTING = 5;
 static const int ID_MAIN_MENU_DEFAULT_COUNT = 1;
 
 void
@@ -118,7 +104,6 @@ MainMenuForm::MainMenuForm(void)
        : __pDownloadAppIdKeyList(null)
        , __pAppIdHashMap(null)
        , __pAppIconPathHashMap(null)
-       , __footerViewType()
        , __pFlightModeSetValueAsyncResultListener(null)
 {
 }
@@ -234,12 +219,6 @@ MainMenuForm::GetItemCount(int groupIndex)
                }
                break;
 
-       case ID_GROUP_APPLICATION:
-               {
-                       itemCount = ID_GROUP_APPLICATIONS_ITEM_COUNT;
-               }
-               break;
-
        case ID_GROUP_APPSETTING:
                {
                        itemCount = GetDownLoadAppCount();
@@ -297,12 +276,6 @@ MainMenuForm::CreateGroupItem(int groupIndex, int itemWidth)
                }
                break;
 
-       case ID_GROUP_APPLICATION:
-               {
-                       groupText = ResourceManager::GetString(L"IDS_ST_BODY_APPLICATION");
-               }
-               break;
-
        case ID_GROUP_APPSETTING:
                {
                        groupText = ResourceManager::GetString(L"IDS_ST_BODY_DOWNLOADED_APPLICATIONS");
@@ -415,7 +388,7 @@ MainMenuForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                                        ItemTypeIconAndOneLine(itemRectIcon, itemRectLabel);
                                        itemHeight = (itemRectLabel.height + itemRectSecondLabel.height);
 
-                                       pBitmap = ResourceManager::GetBitmapN(IDB_BLUETOOTH);
+                                       pBitmap = ResourceManager::GetBitmapN(IDB_NFC);
                                        itemText = L"NFC";
                                }
                                break;
@@ -448,7 +421,7 @@ MainMenuForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
 
                        case ID_ITEM_PERSONAL_LOCK_SCREEN:
                                {
-                                       pBitmap = ResourceManager::GetBitmapN(IDB_WALLPAPER);
+                                       pBitmap = ResourceManager::GetBitmapN(IDB_LOCK_SCREEN);
                                        itemText = ResourceManager::GetString(L"IDS_ST_BODY_LOCK_SCREEN");
                                }
                                break;
@@ -491,6 +464,13 @@ MainMenuForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                                }
                                break;
 
+                       case ID_ITEM_DEVICE_CALL_SETTING:
+                               {
+                                       pBitmap = ResourceManager::GetBitmapN(IDB_PHONE);
+                                       itemText = L"Call setting";
+                               }
+                               break;
+
                        case ID_ITEM_DEVICE_DATE_TIME:
                                {
                                        pBitmap = ResourceManager::GetBitmapN(IDB_DATE_AND_TIME);
@@ -542,58 +522,6 @@ MainMenuForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                }
                break;
 
-       case ID_GROUP_APPLICATION:
-               {
-                       switch (itemIndex)
-                       {
-                       case ID_ITEM_APPLICATIONS_PHONE:
-                               {
-                                       pBitmap = ResourceManager::GetBitmapN(IDB_PHONE);
-                                       itemText = ResourceManager::GetString(L"IDS_ST_BODY_PHONE");
-                               }
-                               break;
-
-                       case ID_ITEM_APPLICATIONS_MESSAGE:
-                               {
-                                       pBitmap = ResourceManager::GetBitmapN(IDB_MESSAGE);
-                                       itemText = ResourceManager::GetString(L"IDS_ST_BODY_SIDEBAR_MESSAGES");
-                               }
-                               break;
-
-                       case ID_ITEM_APPLICATIONS_EMAIL:
-                               {
-                                       pBitmap = ResourceManager::GetBitmapN(IDB_EMAIL);
-                                       itemText = ResourceManager::GetString(L"IDS_ST_BODY_EMAIL");
-                               }
-                               break;
-
-                       case ID_ITEM_APPLICATIONS_CONTACTS:
-                               {
-                                       pBitmap = ResourceManager::GetBitmapN(IDB_CONTACTS);
-                                       itemText = ResourceManager::GetString(L"IDS_ST_BODY_CONTACTS");
-                               }
-                               break;
-
-                       case ID_ITEM_APPLICATIONS_CALENDAR:
-                               {
-                                       pBitmap = ResourceManager::GetBitmapN(IDB_CALENDAR);
-                                       itemText = ResourceManager::GetString(L"IDS_ST_BODY_CALENDAR");
-                               }
-                               break;
-
-                       case ID_ITEM_APPLICATIONS_GALLERY:
-                               {
-                                       pBitmap = ResourceManager::GetBitmapN(IDB_GALLERY);
-                                       itemText = ResourceManager::GetString(L"IDS_ST_BODY_GALLERY");
-                               }
-                               break;
-
-                       default:
-                               break;
-                       }
-               }
-               break;
-
        case ID_GROUP_APPSETTING:
                {
                        String appIdKey = GetDownLoadAppIdKeyAt(itemIndex);
@@ -713,7 +641,6 @@ MainMenuForm::DeleteItem(int groupIndex, int itemIndex, TableViewItem* pItem)
 void
 MainMenuForm::OnGroupedTableViewItemStateChanged(Tizen::Ui::Controls::GroupedTableView& tableView, int groupIndex, int itemIndex, Tizen::Ui::Controls::TableViewItem* pItem, Tizen::Ui::Controls::TableViewItemStatus status)
 {
-       bool enableStatus = false;
        SceneManager* pSceneManager = SceneManager::GetInstance();
        AppAssert(pSceneManager);
 
@@ -808,13 +735,6 @@ MainMenuForm::OnGroupedTableViewItemStateChanged(Tizen::Ui::Controls::GroupedTab
                }
                break;
 
-       case ID_GROUP_APPLICATION:
-               {
-                       pSceneName = L"";
-                       FindAppControlScene(itemIndex);
-               }
-               break;
-
        case ID_GROUP_APPSETTING:
                {
                        String appIdKey = GetDownLoadAppIdKeyAt(itemIndex);
@@ -1015,7 +935,10 @@ MainMenuForm::RemoveAllAppIdList(void)
                __pAppIdHashMap->RemoveAll();
                delete __pAppIdHashMap;
                __pAppIdHashMap = null;
+       }
 
+       if (__pAppIconPathHashMap != null)
+       {
                __pAppIconPathHashMap->RemoveAll();
                delete __pAppIconPathHashMap;
                __pAppIconPathHashMap = null;
@@ -1193,16 +1116,7 @@ MainMenuForm::GroupPersonalSceneConnect (int viewMode, int itemIndex, Tizen::Ui:
                {
                        pScene = IDSCN_NULL;
 
-                       ArrayList* pDataList = new (std::nothrow) ArrayList(SingleObjectDeleter);
-                       pDataList->Construct();
-
-                       AppControl* pAppControl = AppManager::FindAppControlN(APPCONTROL_PROVIDER_ID_ACCOUNT, APPCONTROL_OPERATION_ID_CONFIGURE);
-
-                       if (pAppControl)
-                       {
-                               pAppControl->Start(pDataList, null);
-                               delete pAppControl;
-                       }
+                       FindAppControlScene(itemIndex);
                }
                break;
 
@@ -1240,6 +1154,14 @@ MainMenuForm::GroupDeviceSceneConnect(int viewMode, int itemIndex, Tizen::Ui::Co
                }
                break;
 
+       case ID_ITEM_DEVICE_CALL_SETTING:
+               {
+                       pScene = IDSCN_NULL;
+
+                       FindAppControlScene(itemIndex);
+               }
+               break;
+
        case ID_ITEM_DEVICE_DATE_TIME:
                {
                        pScene = IDSCN_DATE_TIME;
@@ -1307,45 +1229,15 @@ MainMenuForm::FindAppControlScene(int itemIndex)
 
        switch (itemIndex)
        {
-       case ID_ITEM_APPLICATIONS_PHONE:
-               {
-                       providerId = APPCONTROL_PROVIDER_ID_PHONE;
-               }
-               break;
-
-       case ID_ITEM_APPLICATIONS_MESSAGE:
-               {
-                       providerId = APPCONTROL_PROVIDER_ID_MESSAGE;
-               }
-               break;
-
-       case ID_ITEM_APPLICATIONS_EMAIL:
-               {
-                       providerId = APPCONTROL_PROVIDER_ID_EMAIL;
-               }
-               break;
-
-       case ID_ITEM_APPLICATIONS_CONTACTS:
-               {
-                       providerId = APPCONTROL_PROVIDER_ID_CONTACTS;
-               }
-               break;
-
-       case ID_ITEM_APPLICATIONS_CALENDAR:
-               {
-                       providerId = APPCONTROL_PROVIDER_ID_CALENDAR;
-               }
-               break;
-
-       case ID_ITEM_APPLICATIONS_GALLERY:
+       case ID_ITEM_PERSONAL_ACCOUNTS:
                {
-                       providerId = APPCONTROL_PROVIDER_ID_GALLERY;
+                       providerId = APPCONTROL_PROVIDER_ID_ACCOUNT;
                }
                break;
 
-       case ID_ITEM_APPLICATIONS_ACCOUNT:
+       case ID_ITEM_DEVICE_CALL_SETTING:
                {
-                       providerId = APPCONTROL_PROVIDER_ID_ACCOUNT;
+                       providerId = APPCONTROL_PROVIDER_ID_PHONE;
                }
                break;
 
index 273316d..247196a 100644 (file)
@@ -213,6 +213,7 @@ MoreConnectivityForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                checkSecondText = true;
                ItemTypeIconAndTwoLine(itemIconRect, itemIconLabelRect, itemSecondLineTextRect, fontSize);
                itmeHeight = (itemIconLabelRect.height + itemSecondLineTextRect.height);
+               pBitmap = ResourceManager::GetBitmapN(IDB_BLUETOOTH);
 
                if (SystemInfo::GetValue(SYSTEM_INFO_KEY_BLUETOOTH, EnableStatus) == E_SUCCESS)
                {
@@ -239,7 +240,7 @@ MoreConnectivityForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                checkSecondText = true;
                ItemTypeIconAndTwoLine(itemIconRect, itemIconLabelRect, itemSecondLineTextRect, fontSize);
                itmeHeight = (itemIconLabelRect.height + itemSecondLineTextRect.height);
-               pBitmap = ResourceManager::GetBitmapN(IDB_BLUETOOTH);
+               pBitmap = ResourceManager::GetBitmapN(IDB_NFC);
                style = TABLE_VIEW_ANNEX_STYLE_ONOFF_SLIDING;
 
                if (SystemInfo::GetValue(SYSTEM_INFO_KEY_NFC, EnableStatus) == E_SUCCESS)
@@ -280,8 +281,6 @@ MoreConnectivityForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
        pItem->Construct(relativeLayout, Dimension(itemWidth, itmeHeight), style);
        pItem->SetBackgroundColor(COLOR_BG_GROUP_ITEM_DEFAULT);
 
-       pBitmap = ResourceManager::GetBitmapN(IDB_BLUETOOTH);
-
        if (pBitmap == null)
        {
                pLabel = new (std::nothrow) Label();
index 9ccd287..d972561 100644 (file)
@@ -1,4 +1,4 @@
-//
+//
 // Copyright (c) 2012 Samsung Electronics Co., Ltd.
 //
 // Licensed under the Flora License, Version 1.0 (the License);
@@ -32,32 +32,33 @@ using namespace Tizen::Ui::Controls;
 using namespace Tizen::Ui::Scenes;
 
 static const int FRFRESH_REQUEST_EVENT = 9999;
-//static const int ITEM_COUNT_ONE = 1;
-static const int CATEGORY_LIST_ITEM_COUNT = 6;
-
-static const wchar_t* CATEGORY_KEY = L"category";
-static const wchar_t* DELIMITER = L":";
-
-//static const wchar_t* APPCONTROL_PROVIDER_ID_SETTINGS = L"http://tizen.org/appcontrol/provider/settings";
-static const wchar_t* APPCONTROL_OPERATION_ID_CONFIGURE = L"http://tizen.org/appcontrol/operation/configure";
-
-//static const wchar_t* APPCONTROL_PROVIDER_ID_BLUETOOTH = L"http://tizen.org/appcontrol/provider/bluetooth";
-//static const wchar_t* APPCONTROL_OPERATION_ID_PICK = L"http://tizen.org/appcontrol/operation/pick";
 
-//static const wchar_t* APPCONTROL_TIME_ZONE = L"category:TimeZone";
+static const wchar_t* APPCONTROL_OPERATION_ID_CONFIGURE_LOCATION = L"http://tizen.org/appcontrol/operation/configure/location";
+static const wchar_t* APPCONTROL_OPERATION_ID_CONFIGURE_BLUETOOTH_VISIBILITY = L"http://tizen.org/appcontrol/operation/configure/bluetooth/visibility";
+static const wchar_t* APPCONTROL_OPERATION_ID_CONFIGURE_FONT_TYPE = L"http://tizen.org/appcontrol/operation/configure/font/type";
+static const wchar_t* APPCONTROL_OPERATION_ID_CONFIGURE_FONT_SIZE = L"http://tizen.org/appcontrol/operation/configure/font/size";
 
 typedef struct _catetory_list {
        String category;
        const wchar_t* sceneName;
 }CATEGORY_LIST;
 
-CATEGORY_LIST categoryList[CATEGORY_LIST_ITEM_COUNT] = {
-       { L"category:Location",                                 IDSCN_LOCATION                  },
-       { L"category:Bluetooth.Visibility",     IDSCN_BLUETOOTH                 },
-       { L"category:USB",                                          IDSCN_DEVELOPER_OPTION      },
-       { L"category:FontType",                                 IDSCN_FONT                              },
-       { L"category:FontSize",                                 IDSCN_FONT                              },
-       { L"category:WifiDirect",                               IDSCN_WIFI_DIRECT               },
+enum _appControlExtraKey
+{
+       APPCONTROL_EXTRA_KEY_LOCATION_GPS = 0,
+       APPCONTROL_EXTRA_KEY_LOCATION_WPS,
+       APPCONTROL_EXTRA_KEY_BLUETOOTH_VISIBILITY,
+       APPCONTROL_EXTRA_KEY_FONT_TYPE,
+       APPCONTROL_EXTRA_KEY_FONT_SIZE,
+       APPCONTROL_EXTRA_KEY_MAX
+};
+
+CATEGORY_LIST extraDataKeyList[APPCONTROL_EXTRA_KEY_MAX] = {
+       { L"http://tizen.org/appcontrol/data/location/gps",             IDSCN_LOCATION  },
+       { L"http://tizen.org/appcontrol/data/location/wps",             IDSCN_LOCATION  },
+       { L"http://tizen.org/appcontrol/data/bluetooth/visibility", IDSCN_BLUETOOTH     },
+       { L"http://tizen.org/appcontrol/data/font/type",                        IDSCN_FONT              },
+       { L"http://tizen.org/appcontrol/data/font/size",                        IDSCN_FONT              }
 };
 
 SettingsApp::SettingsApp(void)
@@ -172,27 +173,79 @@ void
 SettingsApp::OnAppControlRequestReceived(RequestId reqId, const Tizen::Base::String& operationId, const Tizen::Base::String* pUriData,
                                                                                const Tizen::Base::String* pMimeType, const Tizen::Base::Collection::IMap* pExtraData)
 {
-       if (operationId.Equals(APPCONTROL_OPERATION_ID_CONFIGURE, true))
+       AppLogDebug("ENTER");
+       if (operationId.CompareTo(APPCONTROL_OPERATION_ID_CONFIGURE_LOCATION) == 0)
        {
-               int count = 0;
+               AppLogDebug("operationId[%ls]", operationId.GetPointer());
+
                const wchar_t* pSceneName = null;
                ArrayList* pArgs = new (std::nothrow) ArrayList();
                pArgs->Construct();
 
-               String* pCategoryKey = new (std::nothrow) String(CATEGORY_KEY);
-               pCategoryKey->Append(DELIMITER);
-               pCategoryKey->Append(*static_cast<const String*>(pExtraData->GetValue(String(CATEGORY_KEY))));
-               pArgs->Add(pCategoryKey);
+//*
+               pSceneName = extraDataKeyList[APPCONTROL_EXTRA_KEY_LOCATION_GPS].sceneName;
+               pArgs->Add(new (std::nothrow) String(L"http://tizen.org/appcontrol/data/location/gps"));
+/*/
+               ArrayList* pExtraKey = static_cast<ArrayList*>(pExtraData->GetKeysN());
+               String keyData = *static_cast<String*>(pExtraKey->GetAt(0));
+               AppLogDebug("key[%ls]", keyData.GetPointer());
+               pArgs->Add(new (std::nothrow) String(keyData));
+//*/
 
-               for (count = 0; count < CATEGORY_LIST_ITEM_COUNT; count++)
+               if (pSceneName == null)
+               {
+                       Terminate();
+               }
+               else
+               {
+                       __pArgs = pArgs;
+                       __requestId = reqId;
+                       __initialSceneId = pSceneName;
+               }
+       }
+       else if (operationId.CompareTo(APPCONTROL_OPERATION_ID_CONFIGURE_BLUETOOTH_VISIBILITY) == 0)
+       {
+               AppLogTag("hwkim","operationId[%ls]", operationId.GetPointer());
+               const wchar_t* pSceneName = null;
+               ArrayList* pArgs = new (std::nothrow) ArrayList();
+               pArgs->Construct();
+
+//*
+               pSceneName = extraDataKeyList[APPCONTROL_EXTRA_KEY_BLUETOOTH_VISIBILITY].sceneName;
+               pArgs->Add(new (std::nothrow) String(L"http://tizen.org/appcontrol/data/bluetooth/visibility"));
+/*/
+               ArrayList* pExtraKey = static_cast<ArrayList*>(pExtraData->GetKeysN());
+               String keyData = *static_cast<String*>(pExtraKey->GetAt(0));
+               AppLogDebug("key[%ls]", keyData.GetPointer());
+               pArgs->Add(new (std::nothrow) String(keyData));
+//*/
+
+               if (pSceneName == null)
+               {
+                       Terminate();
+               }
+               else
                {
-                       if (pCategoryKey->CompareTo(categoryList[count].category) == 0)
-                       {
-                               pSceneName = categoryList[count].sceneName;
-                               break;
-                       }
+                       __pArgs = pArgs;
+                       __requestId = reqId;
+                       __initialSceneId = pSceneName;
                }
+       }
+       else if (operationId.CompareTo(APPCONTROL_OPERATION_ID_CONFIGURE_FONT_TYPE) == 0)
+       {
+               const wchar_t* pSceneName = null;
+               ArrayList* pArgs = new (std::nothrow) ArrayList();
+               pArgs->Construct();
 
+//*
+               pSceneName = extraDataKeyList[APPCONTROL_EXTRA_KEY_FONT_TYPE].sceneName;
+               pArgs->Add(new (std::nothrow) String(L"http://tizen.org/appcontrol/data/font/type"));
+/*/
+               ArrayList* pExtraKey = static_cast<ArrayList*>(pExtraData->GetKeysN());
+               String keyData = *static_cast<String*>(pExtraKey->GetAt(0));
+               AppLogDebug("key[%ls]", keyData.GetPointer());
+               pArgs->Add(new (std::nothrow) String(keyData));
+//*/
                if (pSceneName == null)
                {
                        Terminate();
@@ -202,8 +255,40 @@ SettingsApp::OnAppControlRequestReceived(RequestId reqId, const Tizen::Base::Str
                        __pArgs = pArgs;
                        __requestId = reqId;
                        __initialSceneId = pSceneName;
+               }
+       }
+       else if (operationId.CompareTo(APPCONTROL_OPERATION_ID_CONFIGURE_FONT_SIZE) == 0)
+       {
+               const wchar_t* pSceneName = null;
+               ArrayList* pArgs = new (std::nothrow) ArrayList();
+               pArgs->Construct();
 
-                       AppLogDebug("[%ls] , [%d]", pSceneName, reqId);
+//*
+               pSceneName = extraDataKeyList[APPCONTROL_EXTRA_KEY_FONT_TYPE].sceneName;
+               pArgs->Add(new (std::nothrow) String(L"http://tizen.org/appcontrol/data/font/size"));
+/*/
+               ArrayList* pExtraKey = static_cast<ArrayList*>(pExtraData->GetKeysN());
+               String keyData = *static_cast<String*>(pExtraKey->GetAt(0));
+               AppLogDebug("key[%ls]", keyData.GetPointer());
+               pArgs->Add(new (std::nothrow) String(keyData));
+//*/
+               if (pSceneName == null)
+               {
+                       Terminate();
+               }
+               else
+               {
+                       __pArgs = pArgs;
+                       __requestId = reqId;
+                       __initialSceneId = pSceneName;
+               }
+       }
+       else
+       {
+               if (operationId.CompareTo(L"http://tizen.org/appcontrol/operation/main"))
+               {
+                       AppLogDebug("operationId is not main terminate");
+                       Terminate();
                }
        }
 }
\ No newline at end of file
index badd36d..aee04d5 100644 (file)
@@ -189,9 +189,11 @@ const wchar_t* IDB_LOCATION = L"settings_74_location.png";
 const wchar_t* IDB_NETWORK = L"settings_74_network.png";
 const wchar_t* IDB_BLUETOOTH = L"settings_74_bluetooth.png";
 const wchar_t* IDB_WIFI_DIRECT = L"settings_74_wifi_direct.png";
+const wchar_t* IDB_NFC = L"settings_106_nfc.png";
 //System
 const wchar_t* IDB_EVENT_NOTIFICATION = L"settings_74_event.png";
-const wchar_t* IDB_WALLPAPER = L"A01-1_icon_Wallpaper.png";
+const wchar_t* IDB_WALLPAPER = L"settings_106_wallpaper.png";
+const wchar_t* IDB_LOCK_SCREEN = L"settings_106_lockscreen.png";
 const wchar_t* IDB_SOUND = L"settings_74_sound.png";
 const wchar_t* IDB_BRIGHTNESS = L"A01-1_icon_Brightness.png";
 const wchar_t* IDB_SECURITY = L"settings_74_security.png";