Fixed the issue in DateTimePicker (N_SE-56831)

Signed-off-by: moinuddin.s <moinuddin.s@samsung.com>
Change-Id: I1b57c4d3fdcb5c129bd156c3cfd456f54a22446f

diff --git a/src/ui/controls/FUiCtrl_DateTimePresenter.cpp b/src/ui/controls/FUiCtrl_DateTimePresenter.cpp
index aac843f..f577e16 100644 (file)
--- a/src/ui/controls/FUiCtrl_DateTimePresenter.cpp
+++ b/src/ui/controls/FUiCtrl_DateTimePresenter.cpp
@@ -1528,12 +1528,12 @@ _DateTimePresenter::LoadResource(void)
 
        if (isAmPmCustomBitmap[DATETIME_STATUS_NORMAL])
        {
-               r = GET_BITMAP_CONFIG_N(DATETIMEPICKER::CONTENT_BG_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, __pAmPmNormalBitmap[DATETIME_STATUS_NORMAL]);
+               r = GET_BITMAP_CONFIG_N(DATETIMEPICKER::AMPM_BG_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, __pAmPmNormalBitmap[DATETIME_STATUS_NORMAL]);
                SysTryCatch(NID_UI_CTRL, (r == E_SUCCESS), , r, "[%s] Propagating.", GetErrorMessage(r));
        }
        else
        {
-               r = GET_REPLACED_BITMAP_CONFIG_N(DATETIMEPICKER::CONTENT_BG_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, backgroundColor[DATETIME_STATUS_NORMAL], __pAmPmNormalBitmap[DATETIME_STATUS_NORMAL]);
+               r = GET_REPLACED_BITMAP_CONFIG_N(DATETIMEPICKER::AMPM_BG_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, backgroundColor[DATETIME_STATUS_NORMAL], __pAmPmNormalBitmap[DATETIME_STATUS_NORMAL]);
                SysTryCatch(NID_UI_CTRL, (r == E_SUCCESS), , r, "[%s] Propagating.", GetErrorMessage(r));
                r = GET_BITMAP_CONFIG_N(DATETIMEPICKER::AMPM_BG_EFFECT_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, __pAmPmEffectBitmap[DATETIME_STATUS_NORMAL]);
                SysTryCatch(NID_UI_CTRL, (r == E_SUCCESS), , r, "[%s] Propagating.", GetErrorMessage(r));
@@ -1541,12 +1541,12 @@ _DateTimePresenter::LoadResource(void)
 
        if (isAmPmCustomBitmap[DATETIME_STATUS_SELECTED])
        {
-               r = GET_BITMAP_CONFIG_N(DATETIMEPICKER::CONTENT_BG_PRESSED, BITMAP_PIXEL_FORMAT_ARGB8888, __pAmPmNormalBitmap[DATETIME_STATUS_SELECTED]);
+               r = GET_BITMAP_CONFIG_N(DATETIMEPICKER::AMPM_BG_PRESSED, BITMAP_PIXEL_FORMAT_ARGB8888, __pAmPmNormalBitmap[DATETIME_STATUS_SELECTED]);
                SysTryCatch(NID_UI_CTRL, (r == E_SUCCESS), , r, "[%s] Propagating.", GetErrorMessage(r));
        }
        else
        {
-               r = GET_REPLACED_BITMAP_CONFIG_N(DATETIMEPICKER::CONTENT_BG_PRESSED, BITMAP_PIXEL_FORMAT_ARGB8888, backgroundColor[DATETIME_STATUS_SELECTED], __pAmPmNormalBitmap[DATETIME_STATUS_SELECTED]);
+               r = GET_REPLACED_BITMAP_CONFIG_N(DATETIMEPICKER::AMPM_BG_PRESSED, BITMAP_PIXEL_FORMAT_ARGB8888, backgroundColor[DATETIME_STATUS_SELECTED], __pAmPmNormalBitmap[DATETIME_STATUS_SELECTED]);
                SysTryCatch(NID_UI_CTRL, (r == E_SUCCESS), , r, "[%s] Propagating.", GetErrorMessage(r));
                r = GET_BITMAP_CONFIG_N(DATETIMEPICKER::AMPM_BG_EFFECT_PRESSED, BITMAP_PIXEL_FORMAT_ARGB8888, __pAmPmEffectBitmap[DATETIME_STATUS_SELECTED]);
                SysTryCatch(NID_UI_CTRL, (r == E_SUCCESS), , r, "[%s] Propagating.", GetErrorMessage(r));
@@ -1554,13 +1554,13 @@ _DateTimePresenter::LoadResource(void)
 
        if (isAmPmCustomBitmap[DATETIME_STATUS_HIGHLIGHTED])
        {
-               r = GET_BITMAP_CONFIG_N(DATETIMEPICKER::CONTENT_BG_HIGHLIGHTED, BITMAP_PIXEL_FORMAT_ARGB8888, __pAmPmNormalBitmap[DATETIME_STATUS_HIGHLIGHTED]);
+               r = GET_BITMAP_CONFIG_N(DATETIMEPICKER::AMPM_BG_HIGHLIGHTED, BITMAP_PIXEL_FORMAT_ARGB8888, __pAmPmNormalBitmap[DATETIME_STATUS_HIGHLIGHTED]);
                SysTryCatch(NID_UI_CTRL, (r == E_SUCCESS), , r, "[%s] Propagating.", GetErrorMessage(r));
 
        }
        else
        {
-               r = GET_REPLACED_BITMAP_CONFIG_N(DATETIMEPICKER::CONTENT_BG_HIGHLIGHTED, BITMAP_PIXEL_FORMAT_ARGB8888, backgroundColor[DATETIME_STATUS_HIGHLIGHTED], __pAmPmNormalBitmap[DATETIME_STATUS_HIGHLIGHTED]);
+               r = GET_REPLACED_BITMAP_CONFIG_N(DATETIMEPICKER::AMPM_BG_HIGHLIGHTED, BITMAP_PIXEL_FORMAT_ARGB8888, backgroundColor[DATETIME_STATUS_HIGHLIGHTED], __pAmPmNormalBitmap[DATETIME_STATUS_HIGHLIGHTED]);
                SysTryCatch(NID_UI_CTRL, (r == E_SUCCESS), , r, "[%s] Propagating.", GetErrorMessage(r));
                r = GET_BITMAP_CONFIG_N(DATETIMEPICKER::AMPM_BG_EFFECT_HIGHLIGHTED, BITMAP_PIXEL_FORMAT_ARGB8888, __pAmPmEffectBitmap[DATETIME_STATUS_HIGHLIGHTED]);
                SysTryCatch(NID_UI_CTRL, (r == E_SUCCESS), , r, "[%s] Propagating.", GetErrorMessage(r));
@@ -1568,12 +1568,12 @@ _DateTimePresenter::LoadResource(void)
 
        if (isAmPmCustomBitmap[DATETIME_STATUS_DISABLED])
        {
-               r = GET_BITMAP_CONFIG_N(DATETIMEPICKER::CONTENT_BG_DISABLED, BITMAP_PIXEL_FORMAT_ARGB8888, __pAmPmNormalBitmap[DATETIME_STATUS_DISABLED]);
+               r = GET_BITMAP_CONFIG_N(DATETIMEPICKER::AMPM_BG_DISABLED, BITMAP_PIXEL_FORMAT_ARGB8888, __pAmPmNormalBitmap[DATETIME_STATUS_DISABLED]);
                SysTryCatch(NID_UI_CTRL, (r == E_SUCCESS), , r, "[%s] Propagating.", GetErrorMessage(r));
        }
        else
        {
-               r = GET_REPLACED_BITMAP_CONFIG_N(DATETIMEPICKER::CONTENT_BG_DISABLED, BITMAP_PIXEL_FORMAT_ARGB8888, backgroundColor[DATETIME_STATUS_DISABLED], __pAmPmNormalBitmap[DATETIME_STATUS_DISABLED]);
+               r = GET_REPLACED_BITMAP_CONFIG_N(DATETIMEPICKER::AMPM_BG_DISABLED, BITMAP_PIXEL_FORMAT_ARGB8888, backgroundColor[DATETIME_STATUS_DISABLED], __pAmPmNormalBitmap[DATETIME_STATUS_DISABLED]);
                SysTryCatch(NID_UI_CTRL, (r == E_SUCCESS), , r, "[%s] Propagating.", GetErrorMessage(r));
                r = GET_BITMAP_CONFIG_N(DATETIMEPICKER::AMPM_BG_EFFECT_DISABLED, BITMAP_PIXEL_FORMAT_ARGB8888, __pAmPmEffectBitmap[DATETIME_STATUS_DISABLED]);
                SysTryCatch(NID_UI_CTRL, (r == E_SUCCESS), , r, "[%s] Propagating.", GetErrorMessage(r));