Fixed Nabi issues N_SE-43611, N_SE-43441

Change-Id: I97510a9aaf60d3d15a0153c7f5e607abb5a63872

diff --git a/inc/StMainMenuForm.h b/inc/StMainMenuForm.h
index 8ac24a0..ab8983a 100644 (file)
--- a/inc/StMainMenuForm.h
+++ b/inc/StMainMenuForm.h
@@ -53,6 +53,7 @@ public:
 
        virtual void OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousSceneId, const Tizen::Ui::Scenes::SceneId& currentSceneId, Tizen::Base::Collection::IList* pArgs);
        virtual void OnSceneDeactivated(const Tizen::Ui::Scenes::SceneId& currentSceneId, const Tizen::Ui::Scenes::SceneId& nextSceneId);
+       virtual void OnFormBackRequested(Tizen::Ui::Controls::Form& source);
 
        virtual Tizen::Ui::Controls::TableViewGroupItem* CreateGroupItem(int groupIndex, int itemWidth);
        virtual Tizen::Ui::Controls::TableViewItem* CreateItem(int groupIndex, int itemIndex, int itemWidth);
@@ -95,4 +96,4 @@ private:
        friend class IFlightModeSetValueAsyncResultListener;
 };
 
-#endif // _ST_MAIN_MENU_FORM_H_
\ No newline at end of file
+#endif // _ST_MAIN_MENU_FORM_H_

diff --git a/src/StLanguageAndRegionForm.cpp b/src/StLanguageAndRegionForm.cpp
index 4f27b5b..0ce1766 100644 (file)
--- a/src/StLanguageAndRegionForm.cpp
+++ b/src/StLanguageAndRegionForm.cpp
@@ -683,7 +683,15 @@ LocaleForm::CreateGroupItem(int groupIndex, int itemWidth)
                                tmpHeight = GetHeightForStringArea(groupText, itemWidth, fontSize);
                                itemHeight += tmpHeight;
 
-                               pDateFormatter->ApplyPattern("EEE, MMM dd, yyyy");
+                               String localPattern;
+                               if (SettingInfo::GetValue(L"http://tizen.org/setting/locale.date.format",localPattern) == E_SUCCESS)
+                               {
+                                       pDateFormatter->ApplyPattern(localPattern);
+                               }
+                               else
+                               {
+                                       pDateFormatter->ApplyPattern("EEE, MMM dd, yyyy");
+                               }
                                pDateFormatter->Format(dateTime, formattedString);
                                formattedString = dateText + L" : " + formattedString;
                                groupText.Insert(L"\n" + formattedString, groupText.GetLength());
@@ -1064,7 +1072,15 @@ LocaleForm::UpdateGroupItem(int groupIndex, Tizen::Ui::Controls::TableViewGroupI
                                tempHeight = GetLineheight(groupText, labelWidth, fontSize, lineCount, lineHeight);
                                itemHeight += tempHeight;
 
-                               pDateFormatter->ApplyPattern("EEE, MMM dd, yyyy");
+                               String localPattern;
+                               if (SettingInfo::GetValue(L"http://tizen.org/setting/locale.date.format",localPattern) == E_SUCCESS)
+                               {
+                                       pDateFormatter->ApplyPattern(localPattern);
+                               }
+                               else
+                               {
+                                       pDateFormatter->ApplyPattern("EEE, MMM dd, yyyy");
+                               }
                                pDateFormatter->Format(dateTime, formattedString);
                                formattedString = dateText + L" : " + formattedString;
                                groupText.Insert(L"\n" + formattedString, groupText.GetLength());

diff --git a/src/StMainMenuForm.cpp b/src/StMainMenuForm.cpp
index 852d923..523ab8d 100644 (file)
--- a/src/StMainMenuForm.cpp
+++ b/src/StMainMenuForm.cpp
@@ -173,6 +173,20 @@ MainMenuForm::OnSceneDeactivated(const Tizen::Ui::Scenes::SceneId& currentSceneI
 {
 }
 
+void
+MainMenuForm::OnFormBackRequested(Tizen::Ui::Controls::Form& source)
+{
+       if (__isRunningAppControl)
+       {
+               AppLogDebug("busy status");
+               return;
+       }
+
+       UiApp* pApp = UiApp::GetInstance();
+       AppAssert(pApp);
+       pApp->Terminate();
+}
+
 int
 MainMenuForm::GetGroupCount(void)
 {