Fixed Nabi issues N_SE-43866, N_SE-43979, N_SE-43924

Change-Id: Ifb58543d8eafc47e869ca591a4c0b28546cfe8ac

diff --git a/src/IntBrightnessForm.cpp b/src/IntBrightnessForm.cpp
index 8de040f..deda795 100644 (file)
--- a/src/IntBrightnessForm.cpp
+++ b/src/IntBrightnessForm.cpp
@@ -203,6 +203,12 @@ BrightnessForm::OnSliderBarMoved(Slider& source, int value)
        if (__manualBrightness == true)
        {
                PowerManager::SetScreenBrightness(value);
+               AppRegistry* pAppRegistry = App::GetInstance()->GetAppRegistry();
+               String sliderKey("SliderValue");
+               if (pAppRegistry)
+               {
+                       pAppRegistry->Set(sliderKey,value);
+               }
        }
 }
 

diff --git a/src/IntHistoryListForm.cpp b/src/IntHistoryListForm.cpp
index 37166e6..2c57541 100644 (file)
--- a/src/IntHistoryListForm.cpp
+++ b/src/IntHistoryListForm.cpp
@@ -700,6 +700,11 @@ HistoryListForm::GetGroupCount(void)
                else
                {
                        int count = 0;
+                       if (__searchText.GetLength() > 0)
+                       {
+                               __searchText.Replace(L"%", L"/%");
+                               __searchText.Replace(L"_", L"/_");
+                       }
                //      String searchText = __pSearchBar->GetText();
                        result r = HistoryPresentationModel::GetInstance()->GetSearchHistoryCount(count, __searchText);
                        if(count)
@@ -728,6 +733,7 @@ HistoryListForm::GetItemCount(int groupIndex)
        {
                return null;
        }
+
        if (__searchHistory == false)
        {
                startTime = pGroupItemClass->GetStartTime();

diff --git a/src/IntHistoryPresentationModel.cpp b/src/IntHistoryPresentationModel.cpp
index ccce674..144eb28 100644 (file)
--- a/src/IntHistoryPresentationModel.cpp
+++ b/src/IntHistoryPresentationModel.cpp
@@ -968,13 +968,13 @@ HistoryPresentationModel::GetSearchHistory(const int startIndex,const int limit,
        query.Append(historyTable);
        query.Append(L".TITLE LIKE '%");
        query.Append(text);
-       query.Append("%')");
+       query.Append("%' ESCAPE '/')");
        query.Append(" OR ");
        query.Append(L"(");
        query.Append(historyTable);
        query.Append(L".ADDRESS LIKE '%");
        query.Append(text);
-       query.Append("%')");
+       query.Append("%' ESCAPE '/')");
        query.Append(" ORDER BY VISITDATE DESC");
 
 
@@ -1032,13 +1032,13 @@ HistoryPresentationModel::GetSearchHistoryCount(int& historyCount, String& text)
        query.Append(historyTable);
        query.Append(L".TITLE LIKE '%");
        query.Append(text);
-       query.Append("%')");
+       query.Append("% 'ESCAPE '/')");
        query.Append(" OR ");
        query.Append(L"(");
        query.Append(historyTable);
        query.Append(L".ADDRESS LIKE '%");
        query.Append(text);
-       query.Append("%')");
+       query.Append("%' ESCAPE '/')");
        query.Append(" ORDER BY VISITDATE DESC");
 
        r = HistoryPresentationModel::ExecuteQuery(query, count);
@@ -1119,7 +1119,6 @@ HistoryPresentationModel::GetHistoryWithTimeRange(Tizen::Base::DateTime& startTi
 result
 HistoryPresentationModel::GetMostVisitedSites(ArrayList& pHistoryList)
 {
-
        int count = -1;
        String query;
        String historyTable(HISTORY_DATA_TABLE);

diff --git a/src/IntRadioCustomItem.cpp b/src/IntRadioCustomItem.cpp
index 5aa68e1..608650a 100644 (file)
--- a/src/IntRadioCustomItem.cpp
+++ b/src/IntRadioCustomItem.cpp
@@ -77,7 +77,7 @@ RadioCustomItem::Make(void)
        Color pressedTextColor = CUSTOM_COLOR_LISTVIEW_TEXT;
 
        AppLogDebug("RadioCustomItem::the text is %ls",__text.GetPointer());
-       r = AddElement(Rectangle(16, 5, __width - 16 , __height), IDA_FORMAT_STRING, __text, __fontSize, textColor, textColor, textColor, true);
+       r = AddElement(Rectangle(16, 5, __width - 60 , __height), IDA_FORMAT_STRING, __text, __fontSize, textColor, textColor, textColor, true);
        TryCatch(!IsFailed(r),,"RadioCustomItem::the value is %s",GetErrorMessage(r));
 
        CATCH: