Resource config property added in SB and Token EEA

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

diff --git a/src/ui/controls/FUiCtrl_EditPresenter.cpp b/src/ui/controls/FUiCtrl_EditPresenter.cpp
index 66ee94d..a78610d 100755 (executable)
--- a/src/ui/controls/FUiCtrl_EditPresenter.cpp
+++ b/src/ui/controls/FUiCtrl_EditPresenter.cpp
@@ -1588,7 +1588,7 @@ _EditPresenter::DrawChangeableBackground(Canvas& canvas, bool focused, int bitma
                Bitmap* pReplacementColorFocusBitmap = null;
 
                Color focusColor;
-               GET_COLOR_CONFIG(BUTTON::BG_HIGHLIGHTED, focusColor);
+               GET_COLOR_CONFIG(SEARCHBAR::EDIT_BG_FOCUS, focusColor);
 
                pFocusBitmap = __pEdit->GetDefaultFocusBitmap();
 

diff --git a/src/ui/controls/FUiCtrl_TokenEditPresenter.cpp b/src/ui/controls/FUiCtrl_TokenEditPresenter.cpp
index c164a8a..7a6c7e8 100644 (file)
--- a/src/ui/controls/FUiCtrl_TokenEditPresenter.cpp
+++ b/src/ui/controls/FUiCtrl_TokenEditPresenter.cpp
@@ -485,7 +485,7 @@ _TokenEditPresenter::Initialize(const _Control& control)
        GET_SHAPE_CONFIG(TOKENEDIT::TOP_MARGIN, orientation, tokenTopMargin);
        GET_SHAPE_CONFIG(TOKENEDIT::BOTTOM_MARGIN, orientation, tokenBottomMargin);
        GET_SHAPE_CONFIG(TOKENEDIT::TOKEN_HEIGHT, orientation, tokenHeight);
-       GET_COLOR_CONFIG(BUTTON::BG_HIGHLIGHTED, focusTokenColor);
+       GET_COLOR_CONFIG(TOKENEDIT::BG_FOCUS, focusTokenColor);
 
        // For drawing token in specific area
        __clientRect.x = leftMargin;

diff --git a/src/ui/inc/FUi_ResourceSearchBarConfig.h b/src/ui/inc/FUi_ResourceSearchBarConfig.h
index f7cd7ad..0591c92 100644 (file)
--- a/src/ui/inc/FUi_ResourceSearchBarConfig.h
+++ b/src/ui/inc/FUi_ResourceSearchBarConfig.h
@@ -44,6 +44,9 @@ DECLARE_UI_CONFIG(SEARCHBAR);
        DECLARE_COLOR_CONFIG(EDIT_TEXT_NORMAL, 17);
        DECLARE_COLOR_CONFIG(EDIT_TEXT_DISABLED, 18);
        DECLARE_COLOR_CONFIG(EDIT_TEXT_HIGHLIGHTED, 19);
+       DECLARE_COLOR_CONFIG(EDIT_BG_FOCUS, 20);
+       DECLARE_COLOR_CONFIG(EDIT_BG_PRESSED, 21);
+       DECLARE_COLOR_CONFIG(EDIT_BG_HIGHLIGHTED, 22);
        DECLARE_IMAGE_CONFIG(EDIT_BG_NORMAL, 1);
        DECLARE_IMAGE_CONFIG(EDIT_BG_DISABLED, 2);
        DECLARE_IMAGE_CONFIG(EDIT_BG_HIGHLIGHTED, 3);

diff --git a/src/ui/inc/FUi_ResourceTokenEditConfig.h b/src/ui/inc/FUi_ResourceTokenEditConfig.h
index efb8f8a..994c799 100644 (file)
--- a/src/ui/inc/FUi_ResourceTokenEditConfig.h
+++ b/src/ui/inc/FUi_ResourceTokenEditConfig.h
@@ -29,6 +29,7 @@ DECLARE_UI_CONFIG(TOKENEDIT);
        DECLARE_COLOR_CONFIG(BG_SELECTED, 2);
        DECLARE_COLOR_CONFIG(TEXT_NORMAL, 3);
        DECLARE_COLOR_CONFIG(TEXT_SELECTED, 4);
+       DECLARE_COLOR_CONFIG(BG_FOCUS, 5);
        DECLARE_IMAGE_CONFIG(BG_NORMAL, 1);
        DECLARE_IMAGE_CONFIG(BG_NORMAL_EFFECT, 2);
        DECLARE_IMAGE_CONFIG(BG_PRESSED_EFFECT, 3);

diff --git a/src/ui/resource/FUi_ResourceSearchBarConfig.cpp b/src/ui/resource/FUi_ResourceSearchBarConfig.cpp
index f3e3b8e..1954166 100644 (file)
--- a/src/ui/resource/FUi_ResourceSearchBarConfig.cpp
+++ b/src/ui/resource/FUi_ResourceSearchBarConfig.cpp
@@ -34,7 +34,10 @@ START_UI_CONFIG(SEARCHBAR);
        ADD_COLOR_CONFIG(BUTTON_TEXT_HIGHLIGHTED, $B052L4);
 
        ADD_COLOR_CONFIG(EDIT_BG_NORMAL, $W031);
+       ADD_COLOR_CONFIG(EDIT_BG_PRESSED, $B0217);
+       ADD_COLOR_CONFIG(EDIT_BG_HIGHLIGHTED, $W031);
        ADD_COLOR_CONFIG(EDIT_BG_DISABLED, $W031D);
+       ADD_COLOR_CONFIG(EDIT_BG_FOCUS, $W161);
        ADD_COLOR_CONFIG(GUIDE_TEXT_NORMAL, $W032);
        ADD_COLOR_CONFIG(GUIDE_TEXT_DISABLED, $W032D);
        ADD_COLOR_CONFIG(GUIDE_TEXT_HIGHLIGHTED, $W032);

diff --git a/src/ui/resource/FUi_ResourceTokenEditConfig.cpp b/src/ui/resource/FUi_ResourceTokenEditConfig.cpp
index 7b4ed75..f6170c0 100644 (file)
--- a/src/ui/resource/FUi_ResourceTokenEditConfig.cpp
+++ b/src/ui/resource/FUi_ResourceTokenEditConfig.cpp
@@ -28,6 +28,7 @@ START_UI_CONFIG(TOKENEDIT);
        ADD_COLOR_CONFIG(BG_SELECTED, $W0713);
        ADD_COLOR_CONFIG(TEXT_NORMAL, $F011L10);
        ADD_COLOR_CONFIG(TEXT_SELECTED, $F011L10);
+       ADD_COLOR_CONFIG(BG_FOCUS, $W0715);
 
        ADD_IMAGE_CONFIG(BG_NORMAL, #00_contacts_button_bg.#.png);
        ADD_IMAGE_CONFIG(BG_NORMAL_EFFECT, #00_contacts_button_bg_ef.#.png);