From: Changyong Jeon <fin10.jeon@samsung.com>
Date: Thu, 2 May 2013 01:25:01 +0000 (+0900)
Subject: Resolved N_SE-36573 issue
X-Git-Tag: submit/tizen_2.1/20130514.050937~9
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=931ee42fa0295081549b90168ea3242ac5186add;p=apps%2Fosp%2FCalendar.git

Resolved N_SE-36573 issue

Change-Id: If6de1cd55cd1a091e288a6c5a78fd1be950d9f79
---

diff --git a/src/ClEventSearcherForm.cpp b/src/ClEventSearcherForm.cpp
index 335e9ce..74dbc36 100644
--- a/src/ClEventSearcherForm.cpp
+++ b/src/ClEventSearcherForm.cpp
@@ -186,6 +186,7 @@ EventSearcherForm::OnActionPerformed(const Control& source, int actionId)
 void
 EventSearcherForm::OnTextValueChanged(const Control& source)
 {
+	AppLogDebug("Enter");
 	if (__pPm->GetSearchText() != __pSearchBarInput->GetText())
 	{
 		__pPm->SearchEvent(__pSearchBarInput->GetText());
@@ -196,6 +197,7 @@ EventSearcherForm::OnTextValueChanged(const Control& source)
 void
 EventSearcherForm::OnTextValueChangeCanceled(const Control& source)
 {
+	AppLogDebug("Enter");
 	if (__pPm->GetSearchText() != __pSearchBarInput->GetText())
 	{
 		__pPm->SearchEvent(__pSearchBarInput->GetText());
@@ -426,34 +428,25 @@ EventSearcherForm::OnKeypadWillOpen(Control& source)
 void
 EventSearcherForm::OnKeypadOpened(Control& source)
 {
-	Invalidate(true);
 }
 
 void
 EventSearcherForm::OnKeypadClosed(Control& source)
 {
-	String text = __pSearchBarInput->GetText();
-	__pSearchBarInput->SetMode(SEARCH_BAR_MODE_NORMAL);
-	__pSearchBarInput->SetText(text);
-	Invalidate(true);
 }
 
 void
 EventSearcherForm::OnKeypadActionPerformed(Control& source, KeypadAction keypadAction)
 {
-	if (keypadAction == KEYPAD_ACTION_SEARCH || keypadAction == KEYPAD_ACTION_ENTER)
+	AppLogDebug("Enter");
+	if (keypadAction == KEYPAD_ACTION_SEARCH)
 	{
-		SetFocus();
-
 		if (__pPm->GetSearchText() != __pSearchBarInput->GetText())
 		{
 			__pPm->SearchEvent(__pSearchBarInput->GetText());
 			__pGroupedListViewEvents->UpdateList();
 		}
-		String text = __pSearchBarInput->GetText();
-		__pSearchBarInput->SetMode(SEARCH_BAR_MODE_NORMAL);
-		__pSearchBarInput->SetText(text);
-		__pSearchBarInput->Invalidate(false);
+		__pSearchBarInput->HideKeypad();
 	}
 }