JIRA fixes merged from tizen_2.1

Change-Id: I7a0946763a0d8096fd8fa89236311942f3169372
Signed-off-by: Ayush <ayush.sriv@samsung.com>

diff --git a/src/ui/controls/FUiCtrl_EditTimePresenter.cpp b/src/ui/controls/FUiCtrl_EditTimePresenter.cpp
index 5b4221a..5f49167 100644 (file)
--- a/src/ui/controls/FUiCtrl_EditTimePresenter.cpp
+++ b/src/ui/controls/FUiCtrl_EditTimePresenter.cpp
@@ -340,7 +340,7 @@ _EditTimePresenter::GetDisplayAreaBoundsFromHoursStyle(_DateTimeId displayBoxId)
 
        GET_SHAPE_CONFIG(EDITTIME::TIME_TEXT_LEFT_MARGIN, __pEditTime->GetOrientation(), leftMargin);
 
-       if (__pEditTime->GetBoundsF().height > bounds.height)
+       if (__pEditTime->GetBoundsF().height > editTimeHeight)
        {
                editTimeHeight = __pEditTime->GetBoundsF().height;
        }

diff --git a/src/ui/inc/FUiCtrl_DateTimeBarPresenter.h b/src/ui/inc/FUiCtrl_DateTimeBarPresenter.h
index 812aae0..40f7780 100644 (file)
--- a/src/ui/inc/FUiCtrl_DateTimeBarPresenter.h
+++ b/src/ui/inc/FUiCtrl_DateTimeBarPresenter.h
@@ -154,7 +154,7 @@ private:
        static const int FLICK_ANIMATION_TIMER_PERIOD = 10;
        static const int FLICK_ANIMATION_FPS_DATE_TIME_BAR = 30;
        static const int FLICK_ANIMATION_SENSITIVITY_DATE_TIME_BAR = 30;
-       static const int FLICK_ANIMATION_VELOCITY_FACTOR_DATE_TIME_BAR = 3;
+       static const int FLICK_ANIMATION_VELOCITY_FACTOR_DATE_TIME_BAR = 2;
 
        Tizen::Graphics::FloatRectangle __bodyAreaBounds;
        Tizen::Graphics::FloatRectangle __arrowAreaBounds;