From 30ed6009072034239978ea07dc0692cbc466d6c2 Mon Sep 17 00:00:00 2001
From: Bhavya Kumili <bhavya.k@samsung.com>
Date: Tue, 9 Jul 2013 12:22:36 +0530
Subject: [PATCH] Fix for DateTimeBar Focus issues

Change-Id: I3cad8263d02756c4c2258cd010d67c7d7025128e
---
 src/ui/controls/FUiCtrl_DateTimeBarPresenter.cpp | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/src/ui/controls/FUiCtrl_DateTimeBarPresenter.cpp b/src/ui/controls/FUiCtrl_DateTimeBarPresenter.cpp
index 1c475c4..8cfade2 100644
--- a/src/ui/controls/FUiCtrl_DateTimeBarPresenter.cpp
+++ b/src/ui/controls/FUiCtrl_DateTimeBarPresenter.cpp
@@ -1049,6 +1049,24 @@ _DateTimeBarPresenter::OnKeyPressed(const _Control& source, const _KeyInfo& keyI
 {
 	_KeyCode keyCode = keyInfo.GetKeyCode();
 
+	if (!__isFocused && keyCode == _KEY_ENTER)
+	{
+		return true;
+	}
+
+	if (!__isFocused)
+	{
+		ResetFlickAnimationTimer();
+		RemoveAllItems();
+		__pDateTimeBar->SetInitialValue(GetMinimumValue(), GetMaximumValue(), __focusedValue, __pDateTimeBar->GetSelectedBoxId());
+		__distance = (GetItemWidth() * (-1.0f));
+		LoadItems();
+		AdjustItemPosition(__distance);
+		ValidateAndAdjustStartPosition();
+		SetFocusedItemBounds();
+		__isFocused = true;
+	}
+
 	switch (keyCode)
 	{
 		case KEY_UP:
@@ -1171,6 +1189,11 @@ _DateTimeBarPresenter::OnKeyReleased(const _Control& source, const _KeyInfo& key
 bool
 _DateTimeBarPresenter::OnTouchPressed(const _Control& source, const _TouchInfo& touchinfo)
 {
+	if (__isFocused)
+	{
+		FocusModeChanged();
+	}
+
 	if (&source != __pDateTimeBar)
 	{
 		return false;
-- 
2.7.4