NABI issues N_SE-50115, N_SE-50067, N_SE-49946, N_SE-49897, N_SE-49884, N_SE-48837...
authorGAURAV JAIN <gaurav.j3@samsung.com>
Wed, 28 Aug 2013 06:24:31 +0000 (11:54 +0530)
committerGAURAV JAIN <gaurav.j3@samsung.com>
Wed, 28 Aug 2013 06:49:42 +0000 (12:19 +0530)
Change-Id: Ibe571cc3d4ad5a337b77614b9155424307253931
Signed-off-by: GAURAV JAIN <gaurav.j3@samsung.com>
22 files changed:
inc/StLanguageForm.h
src/StAppSettingForm.cpp
src/StBluetoothForm.cpp
src/StCertificateForm.cpp
src/StCertificateUserForm.cpp
src/StCertificateUserUnInstallForm.cpp
src/StDateTimeForm.cpp
src/StDisplayForm.cpp
src/StDownloadedApplicationForm.cpp
src/StLanguageAndRegionForm.cpp
src/StLanguageForm.cpp
src/StLocationForm.cpp
src/StLocationHelpForm.cpp
src/StNfcForm.cpp
src/StResetSettingForm.cpp
src/StTimeZoneForm.cpp
src/StTypes.cpp
src/StWallpaperImageSelectForm.cpp
src/StWifiApDetailForm.cpp
src/StWifiDirectConnectionForm.cpp
src/StWifiDirectForm.cpp
src/StWifiForm.cpp

index cdd19c0..09068a5 100644 (file)
@@ -60,6 +60,7 @@ public:
 
 private:
        Tizen::Base::Collection::ArrayList* __pLanguageDataList;
+       Tizen::Base::String __previousSelectedLanguage;
 };
 
 #endif // _ST_LANGUAGE_FORM_H_
\ No newline at end of file
index 976ca1e..67c85e6 100644 (file)
@@ -1430,7 +1430,7 @@ AppSettingForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                pItem->SetBackgroundColor(COLOR_BG_GROUP_INDEX_DEFAULT, TABLE_VIEW_ITEM_DRAWING_STATUS_PRESSED);
                pItem->SetIndividualSelectionEnabled(pEditField, true);
 
-               relativeLayout.SetMargin(*pEditField, Y_GROUP_ITEM_DEFAULT, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
+               relativeLayout.SetMargin(*pEditField, Y_GROUP_ITEM_DEFAULT, 0, 0, 0);
                relativeLayout.SetRelation(*pEditField, pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
                relativeLayout.SetRelation(*pEditField, pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);
        }
index 956dba0..1ae074c 100644 (file)
@@ -122,7 +122,7 @@ BluetoothForm::CreateFooter(void)
 result
 BluetoothForm::OnInitializing(void)
 {
-       SetFormStyle(FORM_STYLE_NORMAL | FORM_STYLE_INDICATOR | FORM_STYLE_HEADER | FORM_STYLE_FOOTER);
+       SetFormStyle(FORM_STYLE_NORMAL | FORM_STYLE_INDICATOR | FORM_STYLE_HEADER | FORM_STYLE_FOOTER | FORM_STYLE_LANDSCAPE_INDICATOR_AUTO_HIDE);
        CreateHeader(ResourceManager::GetString(L"IDS_ST_BODY_BLUETOOTH"));
        CreateFooter();
        CreateTableView();
index 3989fa8..1673285 100644 (file)
@@ -104,7 +104,7 @@ CertificateForm::OnTerminating(void)
 void
 CertificateForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousSceneId, const Tizen::Ui::Scenes::SceneId& currentSceneId, Tizen::Base::Collection::IList* pArgs)
 {
-       __pTableView->UpdateTableView();
+       
 }
 
 void
index d95e2e4..9cc9239 100644 (file)
@@ -93,7 +93,7 @@ CertificateUserForm::CreateFooter(void)
 result
 CertificateUserForm::OnInitializing(void)
 {
-       SetFormStyle(FORM_STYLE_NORMAL | FORM_STYLE_INDICATOR | FORM_STYLE_HEADER | FORM_STYLE_FOOTER);
+       SetFormStyle(FORM_STYLE_NORMAL | FORM_STYLE_INDICATOR | FORM_STYLE_HEADER | FORM_STYLE_FOOTER | FORM_STYLE_LANDSCAPE_INDICATOR_AUTO_HIDE);
        CreateHeader(ResourceManager::GetString(L"IDS_ST_BODY_USER_CERTIFICATES"));
        CreateFooter();
 
index f86fe5e..921a4a8 100644 (file)
@@ -79,7 +79,7 @@ CertificateUserUnInstallForm::CreateFooter(void)
 result
 CertificateUserUnInstallForm::OnInitializing(void)
 {
-       SetFormStyle(FORM_STYLE_NORMAL | FORM_STYLE_INDICATOR | FORM_STYLE_HEADER | FORM_STYLE_FOOTER);
+       SetFormStyle(FORM_STYLE_NORMAL | FORM_STYLE_INDICATOR | FORM_STYLE_HEADER | FORM_STYLE_FOOTER | FORM_STYLE_LANDSCAPE_INDICATOR_AUTO_HIDE);
        CreateHeader(ResourceManager::GetString(L"IDS_ST_BODY_USER_CERTIFICATES"));
        CreateFooter();
        CreateTableView();
index bf6680f..a784645 100644 (file)
@@ -104,11 +104,10 @@ DateTimeForm::CreateFooter(void)
 result
 DateTimeForm::OnInitializing(void)
 {
+       AppLogDebug("ENTER");
        CreateHeader(ResourceManager::GetString(L"IDS_ST_BODY_DATE_AND_TIME"));
        CreateTableView();
 
-       AppLogDebug("ENTER");
-
        return E_SUCCESS;
 }
 
@@ -798,6 +797,7 @@ DateTimeForm::OnGroupedTableViewItemStateChanged(Tizen::Ui::Controls::GroupedTab
                {
                        if (itemIndex == ID_ITEM_DATE_AND_TIME_TIME_ZONE)
                        {
+                               __pTableView->CollapseGroup(ID_GROUP_DATE_AND_TIME_FORMAT_LIST);
                                pSceneManager->GoForward(ForwardSceneTransition(IDSCN_TIME_ZONE, SCENE_TRANSITION_ANIMATION_TYPE_LEFT));
                        }
                        else if (itemIndex == ID_ITEM_DATE_AND_TIME_DATE_AND_TIME)
index 7806d53..57cf243 100644 (file)
@@ -115,10 +115,6 @@ DisplayForm::OnTerminating(void)
 void
 DisplayForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousSceneId, const Tizen::Ui::Scenes::SceneId& currentSceneId, Tizen::Base::Collection::IList* pArgs)
 {
-       if (previousSceneId == IDSCN_FONT)
-       {
-               return;
-       }
        __pTableView->UpdateTableView();
 
        bool autoRotation = false;
index a4e8b14..8a39fee 100644 (file)
@@ -232,11 +232,12 @@ DownloadedApplicationForm::CreateItem(int groupIndex, int itemIndex, int itemWid
        pLabel = new (std::nothrow) Label();
        pLabel->Construct(itemMainRectangle, itemMainText);
        pLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
+       pLabel->SetTextVerticalAlignment(ALIGNMENT_MIDDLE);
        pLabel->SetTextConfig(fontSize, LABEL_TEXT_STYLE_NORMAL);
        pLabel->SetTextColor(COLOR_MAIN_TEXT);
 
        pItem->AddControl(pLabel);
-       relativeLayout.SetMargin(*pLabel, itemMainRectangle.x, MAIN_RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
+       relativeLayout.SetMargin(*pLabel, itemMainRectangle.x, 0, 0, 0);
        relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
        relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);
 
index 0235ea2..e108e66 100644 (file)
@@ -575,6 +575,7 @@ LocaleForm::OnTerminating(void)
 void
 LocaleForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousSceneId, const Tizen::Ui::Scenes::SceneId& currentSceneId, Tizen::Base::Collection::IList* pArgs)
 {
+       AppLog("Enter");
        Header* pHeader = GetHeader();
        pHeader->SetTitleText(ResourceManager::GetString(L"IDS_ST_BODY_LANGUAGE_AND_KEYBOARD"));
 
@@ -1006,7 +1007,6 @@ LocaleForm::OnGroupedTableViewItemStateChanged(Tizen::Ui::Controls::GroupedTable
                        #else
                        if (AppControl::FindAndStart(L"http://tizen.org/appcontrol/operation/setting/ime", null, null, null, null, null) == E_SUCCESS)
                        {
-                               SetFocus();
                                __isRunningAppControl = true;
                        }
                        #endif
@@ -1104,8 +1104,11 @@ LocaleForm::UpdateGroupItem(int groupIndex, Tizen::Ui::Controls::TableViewGroupI
                                                pDateFormatter->ApplyPattern("HH:mm");
                                        }
                                }
+                               const wchar_t LRO = 0x202D; //Done changes for Nabi issue 48837 suggested by platform team
+                               const wchar_t LRE = 0x202A;
+                               const wchar_t PDF = 0x202C;
                                pDateFormatter->Format(dateTime, formattedString);
-                               formattedString = timeText + L" : " + formattedString;
+                               formattedString = timeText + L" : " + LRE + formattedString + PDF;
                                groupText.Insert(L"\n" + formattedString, groupText.GetLength());
 
                                tmpText.Remove(0, tmpText.GetLength());
@@ -1116,7 +1119,7 @@ LocaleForm::UpdateGroupItem(int groupIndex, Tizen::Ui::Controls::TableViewGroupI
 
                                formattedString.Remove(0, formattedString.GetLength());
                                pNumberFormatter->Format(inputNumber, formattedString);
-                               groupText.Insert(L"\n" + numberText + L" : " + formattedString, groupText.GetLength());
+                               groupText.Insert(L"\n" + numberText + L" : " + LRE + formattedString + PDF, groupText.GetLength());
 
                                tmpText.Remove(0, tmpText.GetLength());
                                tmpText.Insert(formattedString, tmpText.GetLength());
@@ -1127,7 +1130,7 @@ LocaleForm::UpdateGroupItem(int groupIndex, Tizen::Ui::Controls::TableViewGroupI
                                }
                                else
                                {
-                                       formattedString = numberText + L" : " + formattedString;
+                                       formattedString = numberText + L" : " + LRE + formattedString + PDF;
                                        tmpText.Remove(0, tmpText.GetLength());
                                        tmpText.Insert(formattedString, tmpText.GetLength());
                                        tempHeight = GetLineheight(tmpText, labelWidth, fontSize, lineCount, lineHeight);
index a5465fc..14074cb 100644 (file)
@@ -67,6 +67,7 @@ LocaleLanguageForm::OnInitializing(void)
        CreateHeader(ResourceManager::GetString(L"IDS_ST_HEADER_DISPLAY_LANGUAGE"));
        CreateTableView();
 
+       SettingInfo::GetValue(SETTING_INFO_KEY_LOCALE_LANGUAGE, __previousSelectedLanguage);
        return SettingInfo::AddSettingEventListener(*this);
 }
 
@@ -284,10 +285,19 @@ LocaleLanguageForm::OnGroupedTableViewItemStateChanged(Tizen::Ui::Controls::Grou
                }
        }
 
-       if (SettingInfo::SetValue(SETTING_INFO_KEY_LOCALE_LANGUAGE, langCode) != E_SUCCESS)
+       if(langCode.CompareTo(__previousSelectedLanguage) != 0)
        {
-               AppLogDebug("set langCode[%ls] result[%s]", langCode.GetPointer(), GetErrorMessage(GetLastResult()));
+               if (SettingInfo::SetValue(SETTING_INFO_KEY_LOCALE_LANGUAGE, langCode) != E_SUCCESS)
+               {
+                       AppLogDebug("set langCode[%ls] result[%s]", langCode.GetPointer(), GetErrorMessage(GetLastResult()));
+               }
+       }
+       else
+       {
+               pSceneManager->GoBackward(BackwardSceneTransition(SCENE_TRANSITION_ANIMATION_TYPE_RIGHT), null);
        }
+
+       __previousSelectedLanguage = langCode;
 }
 
 void
index a4fe4a4..cffb7d3 100644 (file)
@@ -85,7 +85,7 @@ LocationForm::CreateFooter(void)
 result
 LocationForm::OnInitializing(void)
 {
-       SetFormStyle(FORM_STYLE_NORMAL | FORM_STYLE_INDICATOR | FORM_STYLE_HEADER | FORM_STYLE_FOOTER);
+       SetFormStyle(FORM_STYLE_NORMAL | FORM_STYLE_INDICATOR | FORM_STYLE_HEADER | FORM_STYLE_FOOTER | FORM_STYLE_LANDSCAPE_INDICATOR_AUTO_HIDE);
        CreateHeader(ResourceManager::GetString(L"IDS_ST_BODY_LOCATIONS"));
        CreateFooter();
        CreateTableView();
index 115b05b..d7eb8b3 100644 (file)
@@ -115,11 +115,6 @@ LocationHelpForm::CreateHelpText(const Rectangle& bounds)
                HelpContentsRect.y = (helpTitleRect.y + helpTitleRect.height);
                HelpContentsRect.height = GetHeightForStringArea(itemHelp, bounds.width , fontSize) + H_TEXT_GAP;
 
-               if ((count == ID_HELP_TEXT_NETWORK_POSITION) && (fontSize > FONT_MAIN_TEXT_SIZE_LARGE))
-               {
-                       HelpContentsRect.height = GetHeightForStringArea(itemHelp, bounds.width + W_HUGE_SIZE_PORTRAIT_TEXT_GAP , fontSize) + H_TEXT_GAP;
-               }
-
                Label* pLabel = new (std::nothrow) Label();
                pLabel->Construct(helpTitleRect, itemTitle);
                pLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
index ee9ab2c..264e6b8 100644 (file)
@@ -496,9 +496,9 @@ NfcForm::UpdateGroupItem(int groupIndex, Tizen::Ui::Controls::TableViewGroupItem
        int fontSize = GetFontSize();
        int itemHeight = GetHeightForStringArea(groupText, clientRect.width, fontSize) + H_TEXT_GAP;
 
-       itemRect.height = itemHeight + H_GROUP_INDEX_HELP_TEXT_TOP_GAP;
+       itemRect.height = itemHeight;
 
-       pLabel->SetBounds(pLabel->GetX(), pLabel->GetY(), clientRect.width, itemHeight+H_GROUP_INDEX_HELP_TEXT_TOP_GAP);
+       pLabel->SetBounds(pLabel->GetX(), pLabel->GetY(), clientRect.width, itemHeight);
        pItem->SetBounds(itemRect);
 }
 
@@ -531,11 +531,39 @@ NfcForm::OnOrientationChanged(const Tizen::Ui::Control& source, Tizen::Ui::Orien
 void
 NfcForm::OnUserEventReceivedN(RequestId requestId, Tizen::Base::Collection::IList* pArgs)
 {
+       AppLog("Enter");
        if (requestId == REFRESH_REQUEST_EVENT)
        {
                if (__pTableView)
                {
-                       __pTableView->RefreshAllItems();
+                       if (__pNfcPredefinedItemPresentationModelInstance == null)
+                       {
+                               __pNfcPredefinedItemPresentationModelInstance = NfcPredefinedItemPresentationModel::GetInstance();
+                       }
+
+                       if (__pNfcPredefinedItemPresentationModelInstance == null)
+                       {
+                               AppLogDebug("__pNfcPredefinedItemPresentationModelInstance == null");
+                               return;
+                       }
+
+                       if (__pNfcPredefinedItemPresentationModelInstance != null)
+                       {
+                               __pNfcPredefinedItemPresentationModelInstance->InitReservedPushCandidatesList();
+                               __pResevedPushCandidatesAppidList = __pNfcPredefinedItemPresentationModelInstance->GetAllListReservedPushCandidatesAppIdList();
+                               if (__pResevedPushCandidatesAppidList != null)
+                               {
+                                       if (__pResevedPushCandidatesAppidList->GetCount() > 0)
+                                       {
+                                               __isPredefinedItem = true;
+                                       }
+                                       else
+                                       {
+                                               __isPredefinedItem = false;
+                                       }
+                               }
+                       }
+                       __pTableView->UpdateTableView();
                        bool nfcActivated = false;
                        if (__pNfcPresentationModelInstance != null)
                        {
index 7396062..0d3a25d 100644 (file)
@@ -162,7 +162,7 @@ ResetterSettingForm::CreateTableView(void)
 result
 ResetterSettingForm::OnInitializing(void)
 {
-       SetFormStyle(FORM_STYLE_NORMAL | FORM_STYLE_INDICATOR | FORM_STYLE_HEADER | FORM_STYLE_FOOTER);
+       SetFormStyle(FORM_STYLE_NORMAL | FORM_STYLE_INDICATOR | FORM_STYLE_HEADER | FORM_STYLE_FOOTER | FORM_STYLE_LANDSCAPE_INDICATOR_AUTO_HIDE);
        CreateHeader(ResourceManager::GetString(L"IDS_ST_HEADER_RESET_SETTINGS"));
        CreateFooter();
        CreateTableView();
index ed4446b..a607c1b 100644 (file)
@@ -165,7 +165,7 @@ TimeZoneForm::CreateTableView(void)
 result
 TimeZoneForm::OnInitializing(void)
 {
-       SetFormStyle(FORM_STYLE_NORMAL | FORM_STYLE_INDICATOR | FORM_STYLE_HEADER | FORM_STYLE_FOOTER);
+       SetFormStyle(FORM_STYLE_NORMAL | FORM_STYLE_INDICATOR | FORM_STYLE_HEADER | FORM_STYLE_FOOTER | FORM_STYLE_LANDSCAPE_INDICATOR_AUTO_HIDE);
        Rectangle bounds = GetClientAreaBounds();
        Rectangle searchbarBounds = bounds;
 
index 166d545..14ff15a 100644 (file)
@@ -97,7 +97,7 @@ const int W_GROUP_INDEX_DEFAULT_LABEL = 720;
 const int X_GROUP_INDEX_DEFAULT_LABEL = 0;
 const int Y_GROUP_INDEX_DEFAULT_LABEL = 36;
 
-const int H_GROUP_ITEM_DEFAULT_LABEL = 114;
+const int H_GROUP_ITEM_DEFAULT_LABEL = 120;
 const int W_GROUP_ITEM_DEFAULT_LABEL = 720;
 const int X_GROUP_ITEM_DEFAULT_LABEL = 16;
 const int Y_GROUP_ITEM_DEFAULT_LABEL = 0;
index 6a11693..b4ebdaa 100644 (file)
@@ -88,7 +88,7 @@ WallpaperImageSelectForm::CreateFooter(void)
 result
 WallpaperImageSelectForm::OnInitializing(void)
 {
-       SetFormStyle(FORM_STYLE_NORMAL | FORM_STYLE_INDICATOR | FORM_STYLE_HEADER | FORM_STYLE_FOOTER);
+       SetFormStyle(FORM_STYLE_NORMAL | FORM_STYLE_INDICATOR | FORM_STYLE_HEADER | FORM_STYLE_FOOTER | FORM_STYLE_LANDSCAPE_INDICATOR_AUTO_HIDE);
        CreateFooter();
        SetOrientationAutoMode();
        return E_SUCCESS;
index 8f7669d..b748dbd 100644 (file)
@@ -124,7 +124,7 @@ WifiApDetailForm::CreateFooter(void)
 result
 WifiApDetailForm::OnInitializing(void)
 {
-       SetFormStyle(FORM_STYLE_NORMAL | FORM_STYLE_INDICATOR | FORM_STYLE_HEADER | FORM_STYLE_FOOTER);
+       SetFormStyle(FORM_STYLE_NORMAL | FORM_STYLE_INDICATOR | FORM_STYLE_HEADER | FORM_STYLE_FOOTER | FORM_STYLE_LANDSCAPE_INDICATOR_AUTO_HIDE);
        CreateHeader(ResourceManager::GetString(L"IDS_WIFI_HEADER_DETAILS"));
        CreateTableView();
 
index 7f48783..e68dbed 100644 (file)
@@ -308,7 +308,7 @@ WifiDirectConnectionForm::StopInPorgressAnimation(void)
 result
 WifiDirectConnectionForm::OnInitializing(void)
 {
-       SetFormStyle(FORM_STYLE_NORMAL | FORM_STYLE_INDICATOR | FORM_STYLE_HEADER | FORM_STYLE_FOOTER);
+       SetFormStyle(FORM_STYLE_NORMAL | FORM_STYLE_INDICATOR | FORM_STYLE_HEADER | FORM_STYLE_FOOTER | FORM_STYLE_LANDSCAPE_INDICATOR_AUTO_HIDE);
        CreateHeader(ResourceManager::GetString(L"IDS_WIFI_BUTTON_MULTI_CONNECT"));
        CreateFooter();
        CreateGroupText();
index 2c2975c..4bc972d 100644 (file)
@@ -161,7 +161,7 @@ WifiDirectForm::SetFooterText(const int actionId, Tizen::Base::String itemText)
 result
 WifiDirectForm::OnInitializing(void)
 {
-       SetFormStyle(FORM_STYLE_NORMAL | FORM_STYLE_INDICATOR | FORM_STYLE_HEADER | FORM_STYLE_FOOTER);
+       SetFormStyle(FORM_STYLE_NORMAL | FORM_STYLE_INDICATOR | FORM_STYLE_HEADER | FORM_STYLE_FOOTER | FORM_STYLE_LANDSCAPE_INDICATOR_AUTO_HIDE);
        CreateHeader(ResourceManager::GetString(L"IDS_ST_HEADER_WI_FI_DIRECT"));
        CreateFooter();
        CreateTableView();
index 3883bf2..12776d3 100644 (file)
@@ -164,7 +164,7 @@ WifiForm::GetWifiCurrentStatus(void)
 result
 WifiForm::OnInitializing(void)
 {
-       SetFormStyle(FORM_STYLE_NORMAL | FORM_STYLE_INDICATOR | FORM_STYLE_HEADER | FORM_STYLE_FOOTER);
+       SetFormStyle(FORM_STYLE_NORMAL | FORM_STYLE_INDICATOR | FORM_STYLE_HEADER | FORM_STYLE_FOOTER | FORM_STYLE_LANDSCAPE_INDICATOR_AUTO_HIDE);
        CreateHeader(ResourceManager::GetString(L"IDS_ST_BODY_WI_FI"));
        CreateFooter();
        CreateTableView();