Nabi issue resolution N_SE-37733 and N_SE-38202

Change-Id: I18b069ab97f41e03b668d990f7434e930a535d66
Signed-off-by: chitta ranjan <chitta.rs@samsung.com>

diff --git a/src/StDisplayForm.cpp b/src/StDisplayForm.cpp
index 28e47d7..f5265b9 100644 (file)
--- a/src/StDisplayForm.cpp
+++ b/src/StDisplayForm.cpp
@@ -1,4 +1,4 @@
-//
+//
 // Copyright (c) 2012 Samsung Electronics Co., Ltd.
 //
 // Licensed under the Flora License, Version 1.1 (the License);
@@ -382,6 +382,11 @@ DisplayForm::OnUserEventReceivedN(RequestId requestId, Tizen::Base::Collection::
        if (requestId == FRFRESH_REQUEST_EVENT)
        {
                int itemCount = __pTableView->GetItemCountAt(ID_GROUP_BACKLIGHT_TIME_LIST);
+               bool autoRotation = false;
+               if (SettingInfo::GetValue(SETTING_INFO_KEY_SCREEN_ROTAION_AUTO, autoRotation) == E_SUCCESS)
+               {
+                       __pTableView->SetItemChecked(ID_GROUP_AUTO_ROTATE_SCREEN, ID_ITEM_AUTO_ROTATE_SCREEN, autoRotation);
+               }
 
                for (int index = 0; index < itemCount; index++)
                {

diff --git a/src/StLanguageAndRegionForm.cpp b/src/StLanguageAndRegionForm.cpp
index 14b8ede..e4c6e62 100644 (file)
--- a/src/StLanguageAndRegionForm.cpp
+++ b/src/StLanguageAndRegionForm.cpp
@@ -966,6 +966,10 @@ LocaleForm::OnGroupedTableViewItemStateChanged(Tizen::Ui::Controls::GroupedTable
        {
        case ID_GROUP_LANGUAGE_AND_REGION_MAIN:
                {
+                       if (__isRunningAppControl == true)
+                       {
+                               return;
+                       }
                        if (itemIndex == ID_ITEM_LANGUAGE_AND_REGION_MAIN_DISPLAY_LANGUAGE)
                        {
                                // TODO: Set display language. does not yet support