Revert Resource config change for EEA

Change-Id: I5c5c66416a175779a03332fd496248f09bb1bb7d
Signed-off-by: Kunal Sinha <kunal.sinha@samsung.com>

diff --git a/inc/FUiUiConfigurationTypes.h b/inc/FUiUiConfigurationTypes.h
index d1365f1..4d22668 100644 (file)
--- a/inc/FUiUiConfigurationTypes.h
+++ b/inc/FUiUiConfigurationTypes.h
@@ -3074,12 +3074,6 @@ struct _OSP_EXPORT_ ColorKey
                * @since                2.1
                */
                _OSP_EXPORT_ static const int TEXT_SELECTED;
-               /**
-                * The property key to get the selected text color of token edit.
-                *
-               * @since                2.1
-               */
-               _OSP_EXPORT_ static const int BG_FOCUS;
        };
 };
 }} //Tizen::Ui

diff --git a/src/ui/FUiUiConfiguration.cpp b/src/ui/FUiUiConfiguration.cpp
index 7e5c45e..a60cca6 100644 (file)
--- a/src/ui/FUiUiConfiguration.cpp
+++ b/src/ui/FUiUiConfiguration.cpp
@@ -449,7 +449,6 @@ const int ColorKey::TokenEdit::BG_NORMAL = _TOKENEDIT::BG_NORMAL_COLOR;
 const int ColorKey::TokenEdit::BG_SELECTED = _TOKENEDIT::BG_SELECTED_COLOR;
 const int ColorKey::TokenEdit::TEXT_NORMAL = _TOKENEDIT::TEXT_NORMAL_COLOR;
 const int ColorKey::TokenEdit::TEXT_SELECTED = _TOKENEDIT::TEXT_SELECTED_COLOR;
-const int ColorKey::TokenEdit::BG_FOCUS = _TOKENEDIT::BG_FOCUS_COLOR;
 
 UiConfiguration::UiConfiguration(void)
 {

diff --git a/src/ui/controls/FUiCtrl_TokenEditPresenter.cpp b/src/ui/controls/FUiCtrl_TokenEditPresenter.cpp
index e8a42dd..c164a8a 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(TOKENEDIT::BG_FOCUS, focusTokenColor);
+       GET_COLOR_CONFIG(BUTTON::BG_HIGHLIGHTED, focusTokenColor);
 
        // For drawing token in specific area
        __clientRect.x = leftMargin;
@@ -3987,8 +3987,11 @@ _TokenEditPresenter::OnKeyPressed(const _Control& source, const _KeyInfo& keyInf
                        }
                        else
                        {
-                               __focusedTokenIndex--;
-                               focusChanged = true;
+                               if (__focusedTokenIndex > 0)
+                               {
+                                       __focusedTokenIndex--;
+                                       focusChanged = true;
+                               }
                        }
                }
        }

diff --git a/src/ui/inc/FUi_ResourceTokenEditConfig.h b/src/ui/inc/FUi_ResourceTokenEditConfig.h
index e99ba4c..efb8f8a 100644 (file)
--- a/src/ui/inc/FUi_ResourceTokenEditConfig.h
+++ b/src/ui/inc/FUi_ResourceTokenEditConfig.h
@@ -29,7 +29,6 @@ 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);
@@ -54,5 +53,4 @@ DECLARE_UI_CONFIG(TOKENEDIT);
        DECLARE_SHAPE_CONFIG(HIDDEN_TOKEN_COUNT_DISPLAY_HEIGHT, 17);
        DECLARE_SHAPE_CONFIG(TOKEN_TITLE_RECT_WIDTH, 18);
 DECLARE_END_UI_CONFIG(TOKENEDIT);
-
-#endif //_FUI_RESOURCE_TOKEN_EDIT_CONFIG_H_
\ No newline at end of file
+#endif //_FUI_RESOURCE_TOKEN_EDIT_CONFIG_H_

diff --git a/src/ui/resource/FUi_ResourceConfigParser.cpp b/src/ui/resource/FUi_ResourceConfigParser.cpp
index 3706bfb..3b6c256 100644 (file)
--- a/src/ui/resource/FUi_ResourceConfigParser.cpp
+++ b/src/ui/resource/FUi_ResourceConfigParser.cpp
@@ -4051,10 +4051,6 @@ ConfigParser::GetColorKeyTable(void)
                        const char* key ="TOKENEDIT::TEXT_SELECTED";
                        __pColorKeyTable->Add(ResourceKey(key), _TOKENEDIT::TEXT_SELECTED_COLOR);
                }
-               {
-                       const char* key ="TOKENEDIT::BG_FOCUS";
-                       __pColorKeyTable->Add(ResourceKey(key), _TOKENEDIT::BG_FOCUS_COLOR);
-               }
        }
        return __pColorKeyTable;
 }

diff --git a/src/ui/resource/FUi_ResourceTokenEditConfig.cpp b/src/ui/resource/FUi_ResourceTokenEditConfig.cpp
index f6170c0..7b4ed75 100644 (file)
--- a/src/ui/resource/FUi_ResourceTokenEditConfig.cpp
+++ b/src/ui/resource/FUi_ResourceTokenEditConfig.cpp
@@ -28,7 +28,6 @@ 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);