Nabi issue N_SE-49172, N_SE-49295, N_SE-49175, N_SE-49183, N_SE-48987 resolution

Change-Id: I81ea4a91fc91c7c6f373c88cf3b3f846c1e17980
Signed-off-by: GAURAV JAIN <gaurav.j3@samsung.com>

diff --git a/src/StAppSettingForm.cpp b/src/StAppSettingForm.cpp
index de97f5d..976ca1e 100644 (file)
--- a/src/StAppSettingForm.cpp
+++ b/src/StAppSettingForm.cpp
@@ -1357,6 +1357,7 @@ AppSettingForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                pSlider->SetName(pItemNode->GetId());
 
                pItem->AddControl(pSlider);
+               pItem->SetIndividualSelectionEnabled(pSlider, true);
                relativeLayout.SetMargin(*pSlider, 0, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
                relativeLayout.SetRelation(*pSlider, pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
                relativeLayout.SetRelation(*pSlider, pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);
@@ -1671,7 +1672,6 @@ AppSettingForm::OnGroupedTableViewItemStateChanged(Tizen::Ui::Controls::GroupedT
        {
                AppLogDebug("null");
        }
-       SetFocus();
 }
 
 void
@@ -1764,6 +1764,11 @@ AppSettingForm::UpdateItem(int groupIndex, int itemIndex, Tizen::Ui::Controls::T
                        AppLogDebug("pItemNode->GetType not equal ID_APPSETTING_ITEM_TYPE_EXPAND_LIST [%ls]", pItemNode->GetType().GetPointer());
                        pItem->Invalidate(false);
                }
+               else if ((pItemNode->GetType()).Equals(ID_APPSETTING_ITEM_TYPE_INTEGER, false))
+               {
+                       Slider* pSlider = static_cast<Slider*>(pItem->GetControl(0));
+                       pItem->SetIndividualSelectionEnabled(pSlider, true);
+               }
                return;
        }
 
@@ -1814,8 +1819,7 @@ AppSettingForm::OnAdjustmentValueChanged(const Tizen::Ui::Control& source, int a
        }
 
        pNode->SetAttribute(ID_APPSETTING_ATTRIBUTE_TYPE_VALUE, Integer::ToString(adjustment));
-       SetFocus();
-
+       
        if (__pIOAppSetting != null)
        {
                __pIOAppSetting->UpdateChangedValue();

diff --git a/src/StDisplayForm.cpp b/src/StDisplayForm.cpp
index 118a102..7806d53 100644 (file)
--- a/src/StDisplayForm.cpp
+++ b/src/StDisplayForm.cpp
@@ -117,8 +117,6 @@ DisplayForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousSceneId
 {
        if (previousSceneId == IDSCN_FONT)
        {
-               __pTableView->CollapseGroup(ID_GROUP_BACKLIGHT_TIME_LIST);
-               __pTableView->RefreshAllItems();
                return;
        }
        __pTableView->UpdateTableView();

diff --git a/src/StNfcForm.cpp b/src/StNfcForm.cpp
index a9a862e..ee9ab2c 100644 (file)
--- a/src/StNfcForm.cpp
+++ b/src/StNfcForm.cpp
@@ -494,11 +494,11 @@ NfcForm::UpdateGroupItem(int groupIndex, Tizen::Ui::Controls::TableViewGroupItem
        Rectangle itemRect = pItem->GetBounds();
        String groupText = pLabel->GetText();
        int fontSize = GetFontSize();
-       int itemHeight = GetHeightForStringArea(groupText, clientRect.width - W_TEXT_GAP, fontSize) + H_TEXT_GAP;
+       int itemHeight = GetHeightForStringArea(groupText, clientRect.width, fontSize) + H_TEXT_GAP;
 
        itemRect.height = itemHeight + H_GROUP_INDEX_HELP_TEXT_TOP_GAP;
 
-       pLabel->SetBounds(pLabel->GetX(), pLabel->GetY(), clientRect.width - W_TEXT_GAP, itemHeight+H_GROUP_INDEX_HELP_TEXT_TOP_GAP);
+       pLabel->SetBounds(pLabel->GetX(), pLabel->GetY(), clientRect.width, itemHeight+H_GROUP_INDEX_HELP_TEXT_TOP_GAP);
        pItem->SetBounds(itemRect);
 }