Fix some display error about accessibility

Change-Id: I454e54a8d1f9f8bcdd99a408d23d54c132d11ca7
Signed-off-by: TaeHo Choi <thanks.choi@samsung.com>

diff --git a/inc/StLanguageAndRegionForm.h b/inc/StLanguageAndRegionForm.h
index 94b22f7..9f02bfe 100644 (file)
--- a/inc/StLanguageAndRegionForm.h
+++ b/inc/StLanguageAndRegionForm.h
@@ -57,6 +57,8 @@ public:
        virtual void OnGroupedTableViewGroupItemStateChanged(Tizen::Ui::Controls::GroupedTableView& tableView, int groupIndex, Tizen::Ui::Controls::TableViewGroupItem* pItem, Tizen::Ui::Controls::TableViewItemStatus status);
        virtual void OnGroupedTableViewItemStateChanged(Tizen::Ui::Controls::GroupedTableView& tableView, int groupIndex, int itemIndex, Tizen::Ui::Controls::TableViewItem* pItem, Tizen::Ui::Controls::TableViewItemStatus status);
 
+       virtual void OnOrientationChanged(const Tizen::Ui::Control& source, Tizen::Ui::OrientationStatus orientationStatus);
+
 private:
        void RefreshTableViewItem(void);
        void RefreshTableViewGroupItem(int groupIndex);

diff --git a/inc/StRegionForm.h b/inc/StRegionForm.h
index 0287261..e752262 100644 (file)
--- a/inc/StRegionForm.h
+++ b/inc/StRegionForm.h
@@ -67,7 +67,7 @@ public:
        virtual void OnTextValueChangeCanceled(const Tizen::Ui::Control& source){}
 
        virtual void OnKeypadActionPerformed(Tizen::Ui::Control& source, Tizen::Ui::KeypadAction keypadAction);
-       virtual void OnKeypadClosed(Tizen::Ui::Control& source);
+       virtual void OnKeypadClosed(Tizen::Ui::Control& source){}
        virtual void OnKeypadOpened(Tizen::Ui::Control& source){}
        virtual void OnKeypadWillOpen(Tizen::Ui::Control& source){}
        virtual void OnKeypadBoundsChanged(Tizen::Ui::Control& source){}

diff --git a/inc/StTimeZoneForm.h b/inc/StTimeZoneForm.h
index d1229eb..7d0c23c 100644 (file)
--- a/inc/StTimeZoneForm.h
+++ b/inc/StTimeZoneForm.h
@@ -110,7 +110,7 @@ public:
        virtual void OnTextValueChangeCanceled(const Tizen::Ui::Control& source){}
 
        virtual void OnKeypadActionPerformed(Tizen::Ui::Control& source, Tizen::Ui::KeypadAction keypadAction);
-       virtual void OnKeypadClosed(Tizen::Ui::Control& source);
+       virtual void OnKeypadClosed(Tizen::Ui::Control& source){}
        virtual void OnKeypadOpened(Tizen::Ui::Control& source){}
        virtual void OnKeypadWillOpen(Tizen::Ui::Control& source){}
        virtual void OnKeypadBoundsChanged(Tizen::Ui::Control& source){}

diff --git a/src/StAccessibilityForm.cpp b/src/StAccessibilityForm.cpp
index f038f62..32b3187 100644 (file)
--- a/src/StAccessibilityForm.cpp
+++ b/src/StAccessibilityForm.cpp
@@ -200,7 +200,7 @@ AccessibilityForm::CreateGroupItem(int groupIndex, int itemWidth)
        case ID_GROUP_SPEED_AT_WHICH_THE_TEXT_IS_SPOKEN:
                {
                        groupText = ResourceManager::GetString(L"IDS_ST_BODY_SPEED_AT_WHICH_THE_TEXT_IS_SPOKEN");
-                       yItemOffset = H_GROUP_INDEX_HELP_TEXT_TOP_GAP;
+                       yItemOffset = 0;
                        itemHeight = GetHeightForStringArea(groupText, itemWidth, fontSize);
                }
                break;

diff --git a/src/StDateTimeForm.cpp b/src/StDateTimeForm.cpp
index 6203710..0e49c91 100644 (file)
--- a/src/StDateTimeForm.cpp
+++ b/src/StDateTimeForm.cpp
@@ -575,7 +575,7 @@ DateTimeForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                if (groupIndex == ID_GROUP_DATE_AND_TIME_FORMAT)
                {
                        Rectangle detailArrow;
-                       Bitmap* pBitmap = ResourceManager::GetBitmapN(IDB_DETAIL_BUTTON_EXPAND_CLOSED);
+                       Bitmap* pBitmap = null;
                        if (__pTableView->IsGroupExpanded(ID_GROUP_DATE_AND_TIME_FORMAT_LIST))
                        {
                                pBitmap = ResourceManager::GetBitmapN(IDB_DETAIL_BUTTON_EXPAND_OPENED);

diff --git a/src/StFontForm.cpp b/src/StFontForm.cpp
index 1f95d1e..cee1b3b 100644 (file)
--- a/src/StFontForm.cpp
+++ b/src/StFontForm.cpp
@@ -353,7 +353,6 @@ FontForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
 
                if (groupIndex == ID_GROUP_FONT)
                {
-                       pBitmap = ResourceManager::GetBitmapN(IDB_DETAIL_BUTTON_EXPAND_CLOSED);
                        if (__pTableView->IsGroupExpanded(ID_GROUP_FONT_LIST))
                        {
                                pBitmap = ResourceManager::GetBitmapN(IDB_DETAIL_BUTTON_EXPAND_OPENED);

diff --git a/src/StLanguageAndRegionForm.cpp b/src/StLanguageAndRegionForm.cpp
index ff1350b..d2fa491 100644 (file)
--- a/src/StLanguageAndRegionForm.cpp
+++ b/src/StLanguageAndRegionForm.cpp
@@ -1277,4 +1277,11 @@ LocaleForm::RefreshTableViewItem(void)
        {
                RefreshTableViewGroupItem(index);
        }
+}
+
+void
+LocaleForm::OnOrientationChanged(const Tizen::Ui::Control& source, Tizen::Ui::OrientationStatus orientationStatus)
+{
+       RefreshTableViewItem();
+       Invalidate(true);
 }
\ No newline at end of file

diff --git a/src/StLocationHelpForm.cpp b/src/StLocationHelpForm.cpp
index 2a4be47..09dbd76 100644 (file)
--- a/src/StLocationHelpForm.cpp
+++ b/src/StLocationHelpForm.cpp
@@ -138,7 +138,6 @@ LocationHelpForm::CreateHelpText(const Rectangle& bounds)
                AddControl(*pLabel);
 
                Label* pSecondLabel = new (std::nothrow) Label();
-               pSecondLabel = new (std::nothrow) Label();
                pSecondLabel->Construct(HelpContentsRect, itemHelp);
                pSecondLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
                pSecondLabel->SetTextVerticalAlignment(ALIGNMENT_TOP);

diff --git a/src/StMainMenuForm.cpp b/src/StMainMenuForm.cpp
index 7676c45..010ff46 100644 (file)
--- a/src/StMainMenuForm.cpp
+++ b/src/StMainMenuForm.cpp
@@ -79,10 +79,10 @@ 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_CALL_SETTING = 3;
-static const int ID_ITEM_DEVICE_ACCESSIBILITY = 4;
-static const int ID_ITEM_DEVICE_DATE_TIME = 5;
-static const int ID_ITEM_DEVICE_LANGUAGE_KEYBOARD = 6;
-static const int ID_GROUP_DEVICE_ITEM_COUNT = 7;
+static const int ID_ITEM_DEVICE_ACCESSIBILITY = 6;
+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 = 3;
 static const int ID_ITEM_SYSTEM_MANAGE_APPLICATION = 0;
@@ -579,14 +579,7 @@ MainMenuForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                pLabel->SetTextColor(COLOR_MAIN_TEXT);
 
                pItem->AddControl(*pLabel);
-               if (style == TABLE_VIEW_ANNEX_STYLE_ONOFF_SLIDING)
-               {
-                       relativeLayout.SetMargin(*pLabel, itemRectLabel.x, RELATIVE_LAYOUT_RIGHT_MARGIN_ONOFF_SLIDING, 0, 0);
-               }
-               else
-               {
-                       relativeLayout.SetMargin(*pLabel, itemRectLabel.x, MAIN_RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
-               }
+               relativeLayout.SetMargin(*pLabel, itemRectLabel.x, MAIN_RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
                relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
                relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);
 
@@ -725,9 +718,6 @@ MainMenuForm::OnGroupedTableViewItemStateChanged(Tizen::Ui::Controls::GroupedTab
                                        pArgs->Add(*(new (std::nothrow) String(Integer::ToString(itemIndex))));
                                }
                                break;
-
-                       default:
-                               break;
                        }
                }
                break;

diff --git a/src/StNfcForm.cpp b/src/StNfcForm.cpp
index deec483..197e1dc 100644 (file)
--- a/src/StNfcForm.cpp
+++ b/src/StNfcForm.cpp
@@ -103,6 +103,12 @@ NfcForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousSceneId, co
                __pNfcPredefinedItemPresentationModelInstance = NfcPredefinedItemPresentationModel::GetInstance();
        }
 
+       if (__pNfcPredefinedItemPresentationModelInstance == null)
+       {
+               AppLogDebug("__pNfcPredefinedItemPresentationModelInstance == null");
+               return;
+       }
+
        if (__pNfcPredefinedItemPresentationModelInstance != null)
        {
                __pNfcPredefinedItemPresentationModelInstance->InitReservedPushCandidatesList();

diff --git a/src/StRegionForm.cpp b/src/StRegionForm.cpp
index 198e4f1..ac13f6b 100644 (file)
--- a/src/StRegionForm.cpp
+++ b/src/StRegionForm.cpp
@@ -545,10 +545,4 @@ LocaleRegionForm::OnKeypadActionPerformed(Tizen::Ui::Control& source, Tizen::Ui:
        default:
                break;
        }
-}
-
-void
-LocaleRegionForm::OnKeypadClosed(Tizen::Ui::Control& source)
-{
-       __pSearchBar->SetMode(SEARCH_BAR_MODE_NORMAL);
 }
\ No newline at end of file

diff --git a/src/StTimeZoneForm.cpp b/src/StTimeZoneForm.cpp
index 0836317..47c5903 100644 (file)
--- a/src/StTimeZoneForm.cpp
+++ b/src/StTimeZoneForm.cpp
@@ -716,12 +716,6 @@ TimeZoneForm::OnKeypadActionPerformed(Tizen::Ui::Control& source, Tizen::Ui::Key
        }
 }
 
-void
-TimeZoneForm::OnKeypadClosed(Tizen::Ui::Control& source)
-{
-       __pSearchBar->SetMode(SEARCH_BAR_MODE_NORMAL);
-}
-
 result
 TiemZoneComparer::Compare(const Tizen::Base::Object& obj1, const Tizen::Base::Object& obj2, int& cmp) const
 {

diff --git a/src/StWallpaperAlbumListPresentationModel.cpp b/src/StWallpaperAlbumListPresentationModel.cpp
index 96a42f5..af58636 100644 (file)
--- a/src/StWallpaperAlbumListPresentationModel.cpp
+++ b/src/StWallpaperAlbumListPresentationModel.cpp
@@ -411,7 +411,6 @@ bool
 WallpaperAlbumListPresentationModel::GetMinMaxDateTimeString(IList* pContentIdList, String& MinimumTime, String& MaximumTime)
 {
        AppLogDebug("ENTER");
-       int fileCount = pContentIdList->GetCount();
 
        if (pContentIdList == null)
        {
@@ -421,6 +420,8 @@ WallpaperAlbumListPresentationModel::GetMinMaxDateTimeString(IList* pContentIdLi
                return false;
        }
 
+       int fileCount = pContentIdList->GetCount();
+
        if (fileCount == 0)
        {
                MinimumTime = EMPTY_SPACE;
@@ -438,7 +439,6 @@ WallpaperAlbumListPresentationModel::GetMinMaxDateTimeString(IList* pContentIdLi
                {
                        ContentId* pContentId = static_cast<ContentId*>(pContentIdList->GetAt(count));
                        ContentInfo* pContentInfo = dynamic_cast<ImageContentInfo*>(contentManager.GetContentInfoN(*pContentId));
-                       TryReturn(pContentInfo != null, GetLastResult(), "GetContentInfoN failed.");
 
                        if (pContentInfo == null)
                        {
@@ -503,9 +503,13 @@ WallpaperAlbumListPresentationModel::InitializeFileList(AlbumInfo* pAlbumInfo)
                String fullPath = pAlbumInfo->GetDirectory(albumInfoDirectoryIndex++);
                IList* pList = GetContentIdListInDirectoryN(fullPath);
                int contentIdListIndex = 0;
-               while (contentIdListIndex < pList->GetCount())
+
+               if (pList != null)
                {
-                       __pCurrentFolderContentsIdList->Add(pList->GetAt(contentIdListIndex++));
+                       while (contentIdListIndex < pList->GetCount())
+                       {
+                               __pCurrentFolderContentsIdList->Add(pList->GetAt(contentIdListIndex++));
+                       }
                }
        }
 }

diff --git a/src/StWifiForm.cpp b/src/StWifiForm.cpp
index e6a1602..d65a080 100644 (file)
--- a/src/StWifiForm.cpp
+++ b/src/StWifiForm.cpp
@@ -607,13 +607,9 @@ WifiForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                {
                        relativeLayout.SetMargin(*pLabel, itemRectangle.x, RELATIVE_LAYOUT_RIGHT_MARGIN_ONOFF_SLIDING, 0, 0);
                }
-               else if (style == TABLE_VIEW_ANNEX_STYLE_DETAILED)
-               {
-                       relativeLayout.SetMargin(*pLabel, itemRectangle.x, RELATIVE_LAYOUT_RIGHT_MARGIN_DETAIL_BUTTON, 0, 0);
-               }
                else
                {
-                       relativeLayout.SetMargin(*pLabel, itemRectangle.x, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
+                       relativeLayout.SetMargin(*pLabel, itemRectangle.x, RELATIVE_LAYOUT_RIGHT_MARGIN_DETAIL_BUTTON, 0, 0);
                }
                relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
                relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);