fix jira issues

Change-Id: Ie30d3512edd1bd2c1a078071c5135e774b22ff94

diff --git a/src/ClCalendarApp.cpp b/src/ClCalendarApp.cpp
index 2392e9a..1418ef5 100644 (file)
--- a/src/ClCalendarApp.cpp
+++ b/src/ClCalendarApp.cpp
@@ -210,6 +210,9 @@ CalendarApp::OnForeground(void)
        delete pEnum;
 
        AppAssertf(GetAppFrame() != null && GetAppFrame()->GetFrame() != null, "[E_FAILURE] Unable to get frame.");
+
+       // Todo: temporary solution for appcontrol.
+       GetAppFrame()->GetFrame()->SetEnabled(true);
        GetAppFrame()->GetFrame()->Invalidate(true);
 }
 

diff --git a/src/ClMonthPanel.cpp b/src/ClMonthPanel.cpp
index a5578ea..d681f3d 100644 (file)
--- a/src/ClMonthPanel.cpp
+++ b/src/ClMonthPanel.cpp
@@ -1100,11 +1100,9 @@ MonthPanel::OnCurrentDateChanged(const DateTime& currentDate, const DateTime& pr
 void
 MonthPanel::OnDateFocused(const DateTime& focusedDate)
 {
-       AppLogDebug("focusedDate: %ls", focusedDate.ToString().GetPointer());
        DateTime adjustFocusedDate = focusedDate;
        adjustFocusedDate.AddMonths(__pPm->GetCurrentMonth() - adjustFocusedDate.GetMonth());
        adjustFocusedDate.AddYears(__pPm->GetCurrentYear() - adjustFocusedDate.GetYear());
-       AppLogDebug("adjustFocusedDate: %ls", adjustFocusedDate.ToString().GetPointer());
        __pPm->SetCurrentDate(adjustFocusedDate);
        __pListViewEvent->UpdateList();
 }
@@ -1129,6 +1127,7 @@ MonthPanel::OnSettingChanged(Tizen::Base::String &key)
 void
 MonthPanel::OnForeground(void)
 {
+       AppLogDebug("Enter");
        __pPanningAnimationManager->ResetPosition();
 }
 

diff --git a/src/ClReminderForm.cpp b/src/ClReminderForm.cpp
index c00df57..b4901c8 100644 (file)
--- a/src/ClReminderForm.cpp
+++ b/src/ClReminderForm.cpp
@@ -635,20 +635,28 @@ ReminderForm::OnActionPerformed(const Control& source, int actionId)
 void
 ReminderForm::OnKeypadWillOpen(Tizen::Ui::Control& source)
 {
-       __pContextMenuTimeUnitSelector->SetShowState(false);
-       __pButtonReminderTimeUnit->SetEnabled(false);
 }
 void
 ReminderForm::OnKeypadOpened(Tizen::Ui::Control& source)
 {
-       __pButtonReminderTimeUnit->SetEnabled(true);
-       __pButtonReminderTimeUnit->Invalidate(true);
-
+       if (__pButtonReminderTimeUnit->IsVisible())
+       {
+               Point point = __pButtonReminderTimeUnit->ConvertToScreenPosition(__pButtonReminderTimeUnit->GetPosition());
+               point.x -= __pButtonReminderTimeUnit->GetWidth();
+               __pContextMenuTimeUnitSelector->SetAnchorPosition(point);
+               __pContextMenuTimeUnitSelector->Invalidate(false);
+       }
 }
 void
 ReminderForm::OnKeypadClosed(Tizen::Ui::Control& source)
 {
-       __pContextMenuTimeUnitSelector->SetShowState(false);
+       if (__pButtonReminderTimeUnit->IsVisible())
+       {
+               Point point = __pButtonReminderTimeUnit->ConvertToScreenPosition(__pButtonReminderTimeUnit->GetPosition());
+               point.x -= __pButtonReminderTimeUnit->GetWidth();
+               __pContextMenuTimeUnitSelector->SetAnchorPosition(point);
+               __pContextMenuTimeUnitSelector->Invalidate(false);
+       }
 }
 void
 ReminderForm::OnKeypadActionPerformed(Tizen::Ui::Control& source, Tizen::Ui::KeypadAction keypadAction)

diff --git a/src/ClSharePopup.cpp b/src/ClSharePopup.cpp
index 9b59c7f..9cadf90 100644 (file)
--- a/src/ClSharePopup.cpp
+++ b/src/ClSharePopup.cpp
@@ -97,6 +97,7 @@ SharePopup::OnTerminating(void)
 
        delete __pCalendarbook;
        __pCalendarbook = null;
+
        return E_SUCCESS;
 }
 
@@ -179,12 +180,13 @@ SharePopup::OnListViewItemStateChanged(ListView& listView, int index, int elemen
                pArgs->Add(new (std::nothrow) String(KEY_DATA_PATH), pPaths);
 
                result r = AppControl::FindAndStart(operationId, &uri, null, null, pArgs, null);
+               AppLogExceptionIf(IsFailed(r), "[%s] Failed to find and start appcontrol.", GetErrorMessage(r));
                delete pArgs;
 
-               // Todo: temporary solution for delay that between launching appcontrol.
+               // Todo: temporary solution for appcontrol.
                if (!IsFailed(r))
                {
-                       Runtime::Thread::Sleep(1500);
+                       UiApp::GetInstance()->GetAppFrame()->GetFrame()->SetEnabled(false);
                }
 
                SetShowState(false);