Resource config changes for Token and Slider

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

diff --git a/inc/FUiUiConfigurationTypes.h b/inc/FUiUiConfigurationTypes.h
index 5e619b2..4ef95c0 100644 (file)
--- a/inc/FUiUiConfigurationTypes.h
+++ b/inc/FUiUiConfigurationTypes.h
@@ -3223,6 +3223,20 @@ struct _OSP_EXPORT_ ColorKey
                _OSP_EXPORT_ static const int TEXT_SELECTED;
 
                /**
+                * The property key to get the highlighted text color of token edit.
+                *
+               * @since                2.2
+               */
+               _OSP_EXPORT_ static const int TEXT_HIGHLIGHTED;
+
+               /**
+                * The property key to get the disabled text color of token edit.
+                *
+               * @since                2.2
+               */
+               _OSP_EXPORT_ static const int TEXT_DISABLED;
+
+               /**
                 * The property key to get the normal title text color of token edit.
                 *
                * @since                2.2

diff --git a/src/ui/FUiUiConfiguration.cpp b/src/ui/FUiUiConfiguration.cpp
index 3ec1448..617c680 100644 (file)
--- a/src/ui/FUiUiConfiguration.cpp
+++ b/src/ui/FUiUiConfiguration.cpp
@@ -470,6 +470,8 @@ const int ColorKey::TokenEdit::BG_HIGHLIGHTED = _TOKENEDIT::BG_HIGHLIGHTED_COLOR
 const int ColorKey::TokenEdit::BG_DISABLED = _TOKENEDIT::BG_DISABLED_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::TEXT_HIGHLIGHTED = _TOKENEDIT::TEXT_HIGHLIGHTED_COLOR;
+const int ColorKey::TokenEdit::TEXT_DISABLED = _TOKENEDIT::TEXT_DISABLED_COLOR;
 const int ColorKey::TokenEdit::TITLE_TEXT_NORMAL = _TOKENEDIT::TITLE_TEXT_NORMAL_COLOR;
 const int ColorKey::TokenEdit::TITLE_TEXT_PRESSED = _TOKENEDIT::TITLE_TEXT_PRESSED_COLOR;
 const int ColorKey::TokenEdit::TITLE_TEXT_HIGHLIGHTED = _TOKENEDIT::TITLE_TEXT_HIGHLIGHTED_COLOR;

diff --git a/src/ui/controls/FUiCtrl_SliderOverlay.cpp b/src/ui/controls/FUiCtrl_SliderOverlay.cpp
index 68f1f6b..edb61f3 100644 (file)
--- a/src/ui/controls/FUiCtrl_SliderOverlay.cpp
+++ b/src/ui/controls/FUiCtrl_SliderOverlay.cpp
@@ -108,7 +108,7 @@ _SliderOverlay::LoadBitmaps()
        Bitmap* pBitmap = null;
        Bitmap* pReplacementBitmap = null;
 
-       r = GET_BITMAP_CONFIG_N(SLIDER::UPWARD_OVERLAY_BG_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, pBitmap);
+       r = GET_BITMAP_CONFIG_N(SLIDER::OVERLAY_BG_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, pBitmap);
        SysTryReturnResult(NID_UI_CTRL, (r == E_SUCCESS), r, "Propagating.");
 
        pReplacementBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pBitmap, Color::GetColor(COLOR_ID_MAGENTA), __overlayBgColor);

diff --git a/src/ui/inc/FUi_ResourceSliderConfig.h b/src/ui/inc/FUi_ResourceSliderConfig.h
index b5a822e..4506f17 100644 (file)
--- a/src/ui/inc/FUi_ResourceSliderConfig.h
+++ b/src/ui/inc/FUi_ResourceSliderConfig.h
@@ -51,16 +51,15 @@ DECLARE_UI_CONFIG(SLIDER);
        DECLARE_IMAGE_CONFIG(HANDLE_BG_EFFECT_PRESSED, 10);
        DECLARE_IMAGE_CONFIG(HANDLE_BG_EFFECT_DISABLED, 11);
        DECLARE_IMAGE_CONFIG(HANDLE_BG_EFFECT_HIGHLIGHTED, 12);
-       DECLARE_IMAGE_CONFIG(UPWARD_OVERLAY_BG_NORMAL, 13);
-       DECLARE_IMAGE_CONFIG(UPWARD_OVERLAY_BG_EFFECT, 14);
-       DECLARE_IMAGE_CONFIG(GROUPED_TOP_BG_NORMAL, 15);
-       DECLARE_IMAGE_CONFIG(GROUPED_MIDDLE_BG_NORMAL, 16);
-       DECLARE_IMAGE_CONFIG(GROUPED_BOTTOM_BG_NORMAL, 17);
-       DECLARE_IMAGE_CONFIG(GROUPED_TOP_BG_EFFECT_NORMAL, 18);
-       DECLARE_IMAGE_CONFIG(GROUPED_MIDDLE_BG_EFFECT_NORMAL, 19);
-       DECLARE_IMAGE_CONFIG(GROUPED_BOTTOM_BG_EFFECT_NORMAL, 20);
-       DECLARE_IMAGE_CONFIG(GROUPED_SINGLE_BG_NORMAL, 21);
-       DECLARE_IMAGE_CONFIG(GROUPED_SINGLE_BG_EFFECT_NORMAL, 22);
+       DECLARE_IMAGE_CONFIG(OVERLAY_BG_NORMAL, 13);
+       DECLARE_IMAGE_CONFIG(GROUPED_TOP_BG_NORMAL, 14);
+       DECLARE_IMAGE_CONFIG(GROUPED_MIDDLE_BG_NORMAL, 15);
+       DECLARE_IMAGE_CONFIG(GROUPED_BOTTOM_BG_NORMAL, 16);
+       DECLARE_IMAGE_CONFIG(GROUPED_TOP_BG_EFFECT_NORMAL, 17);
+       DECLARE_IMAGE_CONFIG(GROUPED_MIDDLE_BG_EFFECT_NORMAL, 18);
+       DECLARE_IMAGE_CONFIG(GROUPED_BOTTOM_BG_EFFECT_NORMAL, 19);
+       DECLARE_IMAGE_CONFIG(GROUPED_SINGLE_BG_NORMAL, 20);
+       DECLARE_IMAGE_CONFIG(GROUPED_SINGLE_BG_EFFECT_NORMAL, 21);
        DECLARE_SHAPE_CONFIG(HANDLE_WIDTH, 1);
        DECLARE_SHAPE_CONFIG(HANDLE_HEIGHT, 2);
        DECLARE_SHAPE_CONFIG(HANDLE_OFFSET, 3);

diff --git a/src/ui/resource/FUi_ResourceConfigParser.cpp b/src/ui/resource/FUi_ResourceConfigParser.cpp
index 5765a0c..d85ae75 100644 (file)
--- a/src/ui/resource/FUi_ResourceConfigParser.cpp
+++ b/src/ui/resource/FUi_ResourceConfigParser.cpp
@@ -1932,14 +1932,6 @@ ConfigParser::GetImageKeyTable(void)
                        __pImageKeyTable->Add(ResourceKey(key), _SLIDER::HANDLE_BG_HIGHLIGHTED_IMAGE);
                }
                {
-                       const char* key ="SLIDER::UPWARD_OVERLAY_BG_NORMAL";
-                       __pImageKeyTable->Add(ResourceKey(key), _SLIDER::UPWARD_OVERLAY_BG_NORMAL_IMAGE);
-               }
-               {
-                       const char* key ="SLIDER::UPWARD_OVERLAY_BG_NORMAL";
-                       __pImageKeyTable->Add(ResourceKey(key), _SLIDER::UPWARD_OVERLAY_BG_NORMAL_IMAGE);
-               }
-               {
                        const char* key ="SLIDER::GROUPED_TOP_BG_NORMAL";
                        __pImageKeyTable->Add(ResourceKey(key), _SLIDER::GROUPED_TOP_BG_NORMAL_IMAGE);
                }

diff --git a/src/ui/resource/FUi_ResourceSliderConfig.cpp b/src/ui/resource/FUi_ResourceSliderConfig.cpp
index f8c68a5..05428b0 100644 (file)
--- a/src/ui/resource/FUi_ResourceSliderConfig.cpp
+++ b/src/ui/resource/FUi_ResourceSliderConfig.cpp
@@ -60,8 +60,7 @@ START_UI_CONFIG(SLIDER);
        ADD_IMAGE_CONFIG(HANDLE_BG_EFFECT_DISABLED, #00_slider_handle_ef_dim.png);
        ADD_IMAGE_CONFIG(HANDLE_BG_EFFECT_HIGHLIGHTED, #00_slider_handle_ef.png);
 
-       ADD_IMAGE_CONFIG(UPWARD_OVERLAY_BG_NORMAL, #00_slider_popup_bg.#.png);
-       ADD_IMAGE_CONFIG(UPWARD_OVERLAY_BG_EFFECT, #00_slider_popup_bg_ef.#.png);
+       ADD_IMAGE_CONFIG(OVERLAY_BG_NORMAL, #00_slider_popup_bg.#.png);
 
        ADD_IMAGE_CONFIG(GROUPED_TOP_BG_NORMAL, #00_list_group_bg_top.#.png);
        ADD_IMAGE_CONFIG(GROUPED_MIDDLE_BG_NORMAL, #00_list_group_bg_center.#.png);