Fixed Nabi Issues N_SE-36677,37112,37141,37145,37348,37286,37316,37321,37307,37293

Change-Id: Id42cbe806fde740786edc65ea8ce0cf016970f29
Signed-off-by: Vinay Sachdeva <v.sachdeva@samsung.com>

diff --git a/inc/IntHistoryListForm.h b/inc/IntHistoryListForm.h
index 6d779b2..ca9c408 100644 (file)
--- a/inc/IntHistoryListForm.h
+++ b/inc/IntHistoryListForm.h
@@ -26,6 +26,7 @@
 
 #include <FBase.h>
 #include <FUi.h>
+#include <FSystem.h>
 
 /**
  * @class HistoryListForm
@@ -41,6 +42,7 @@ class HistoryListForm
        , public Tizen::Ui::IOrientationEventListener
        , public Tizen::Ui::Controls::ISearchBarEventListener
        , public Tizen::Ui::Scenes::ISceneEventListener
+       , public Tizen::System::ISettingEventListener
 {
 public:
        /**
@@ -109,6 +111,7 @@ public:
        //ISearchBarEventListener
        virtual void OnSearchBarModeChanged(Tizen::Ui::Controls::SearchBar& source, Tizen::Ui::Controls::SearchBarMode mode);
 
+       void OnSettingChanged(Tizen::Base::String& key);
 
 protected:
        static const int IDA_TABBAR_ITEM_1;

diff --git a/src/IntEditHistoryListForm.cpp b/src/IntEditHistoryListForm.cpp
index e8b6eb0..899989e 100644 (file)
--- a/src/IntEditHistoryListForm.cpp
+++ b/src/IntEditHistoryListForm.cpp
@@ -465,7 +465,7 @@ EditHistoryListForm::CreateGroupItem(int groupIndex, int itemWidth)
                text.Append(month);
        }
 
-       text.Append(L".)");
+       text.Append(L")");
        AppLogDebug("startTime day = %d month = %d year = %d",pGroupItemClass->__startTime.GetDay(),pGroupItemClass->__startTime.GetMonth(),pGroupItemClass->__startTime.GetYear());
 
        pItem->SetElement(text, null);

diff --git a/src/IntHistoryListForm.cpp b/src/IntHistoryListForm.cpp
index a762a33..fc32268 100644 (file)
--- a/src/IntHistoryListForm.cpp
+++ b/src/IntHistoryListForm.cpp
@@ -41,6 +41,7 @@ using namespace Tizen::Locales;
 using namespace Tizen::Ui;
 using namespace Tizen::Ui::Controls;
 using namespace Tizen::Ui::Scenes;
+using namespace Tizen::System;
 
 static const wchar_t* IDB_TAB_ICON_BOOKMARKS = L"I01_tab_icon_bookmarks.png";
 static const wchar_t* IDB_TAB_ICON_HISTORY = L"I01_tab_icon_history.png";
@@ -113,6 +114,8 @@ HistoryListForm::OnInitializing(void)
        GetFooter()->AddActionEventListener(*this);
 
        AddOrientationEventListener(*this);
+       SettingInfo::AddSettingEventListener(*this);
+
        pSceneManager = SceneManager::GetInstance();
        if (pSceneManager != null)
        {
@@ -1855,3 +1858,12 @@ GroupItemClass::GetHistoryData(void)
 {
        return __pData;
 }
+
+void
+HistoryListForm::OnSettingChanged(Tizen::Base::String& key)
+{
+       if (__pGroupedListView)
+       {
+               __pGroupedListView->UpdateList();
+       }
+}

diff --git a/src/IntMainForm.cpp b/src/IntMainForm.cpp
index aca9793..11bd171 100644 (file)
--- a/src/IntMainForm.cpp
+++ b/src/IntMainForm.cpp
@@ -2747,6 +2747,7 @@ MainForm::LoadUrl(String& url)
 
        if (ret == true && __pWebViewer != null)
        {
+               SetUrl(url);
                __pWebViewer->LoadUrl(url);
        }
        else if(__pWebViewer != null)
@@ -3632,7 +3633,7 @@ MainForm::OnWebKeypadOpened(Tizen::Web::Controls::Web& source)
                __pFindWordNext->SetEnabled(false);
                __pFindWordPrev->SetEnabled(false);
                __pFindWordCountLabel->SetText(L"0/0");
-               __pWebViewer->SearchText(L"aaaabbbbcccc",true);
+               __pWebViewer->SearchTextAllAsync(L"",false);
                __pFindWordControl->SetShowState(false);
                __pFindWordEditField->HideKeypad();
        }