changing hint text for accessibility.

[framework/osp/uifw.git] / src / ui / controls / FUiCtrl_EditTime.cpp

diff --git a/src/ui/controls/FUiCtrl_EditTime.cpp b/src/ui/controls/FUiCtrl_EditTime.cpp
index fe45dab..70468f1 100644 (file)
--- a/src/ui/controls/FUiCtrl_EditTime.cpp
+++ b/src/ui/controls/FUiCtrl_EditTime.cpp
@@ -490,7 +490,7 @@ _EditTime::OnDraw(void)
 
        __pEditTimePresenter->Draw();
 
-       if(unlikely((_AccessibilityManager::IsActivated())))
+       if (unlikely((_AccessibilityManager::IsActivated())))
        {
                UpdateAccessibilityElement();
        }
@@ -608,8 +608,6 @@ _EditTime::OnChangeLayout(_ControlOrientation orientation)
 bool
 _EditTime::OnTouchPressed(const _Control& source, const _TouchInfo& touchinfo)
 {
-       SetFocused(true);
-
        FloatRectangle absoluteBounds = GetAbsoluteBoundsF();
        if (absoluteBounds.y != __absoluteBounds.y || absoluteBounds.height != __absoluteBounds.height)
        {
@@ -759,6 +757,60 @@ _EditTime::OnSettingChanged(String& key)
        return;
 }
 
+void
+_EditTime::OnDrawFocus(void)
+{
+       __pEditTimePresenter->SetFocusState(true);
+       __pEditTimePresenter->SetFocusedElement();
+       __pEditTimePresenter->DrawFocus();
+       return;
+}
+
+bool
+_EditTime::OnKeyPressed(const _Control &source, const _KeyInfo &keyInfo)
+{
+       _KeyCode keyCode = keyInfo.GetKeyCode();
+
+       switch (keyCode)
+       {
+               case _KEY_ENTER:
+               {
+                       FloatRectangle absoluteBounds = GetAbsoluteBoundsF();
+
+                       if (absoluteBounds.y != __absoluteBounds.y || absoluteBounds.height != __absoluteBounds.height)
+                       {
+                               CalculateDateTimeBarPosition();
+                       }
+                       break;
+               }
+               default:
+               break;
+
+       }
+
+       return __pEditTimePresenter->OnKeyPressed(source, keyInfo);
+}
+
+bool
+_EditTime::OnFocusGained(const _Control &source)
+{
+       __pEditTimePresenter->SetFocusedElement();
+       return true;
+}
+
+bool
+_EditTime::OnFocusLost(const _Control &source)
+{
+       return __pEditTimePresenter->OnFocusLost(source);
+}
+
+void
+_EditTime::OnFocusModeStateChanged(void)
+{
+       __pEditTimePresenter->OnFocusModeStateChanged();
+       return;
+}
+
 FloatRectangle
 _EditTime::GetParentWindowBounds(void) const
 {
@@ -869,7 +921,7 @@ _EditTime::UpdateAccessibilityElement(void)
                        __pAccessibilityAmPmElement->Activate(true);
                }
 
-               String hintAmPmText(L"Double tap to change to ");
+               String hintAmPmText(L"Double tap to edit");
 
                String amString;
                String pmString;
@@ -880,13 +932,11 @@ _EditTime::UpdateAccessibilityElement(void)
                if (__pEditTimePresenter->GetAmEnabled() == true)
                {
                        __pAccessibilityAmPmElement->SetLabel(amString);
-                       hintAmPmText.Append(pmString.GetPointer());
                        string.Append(amString.GetPointer());
                }
                else
                {
                        __pAccessibilityAmPmElement->SetLabel(pmString);
-                       hintAmPmText.Append(amString.GetPointer());
                        string.Append(pmString.GetPointer());
                }
 
@@ -927,7 +977,7 @@ _EditTime::OnAccessibilityReadingElement(const _AccessibilityContainer& control,
 }
 
 bool
-_EditTime::OnAccessibilityReadedElement(const _AccessibilityContainer& control, const _AccessibilityElement& element)
+_EditTime::OnAccessibilityReadElement(const _AccessibilityContainer& control, const _AccessibilityElement& element)
 {
        return false;
 }