Applying new WVGA changes for ColorPicker

Change-Id: If2965289eca68138728909ade9652ccfaf1cb2f8

diff --git a/res/common/usr/share/osp/bitmaps/480x800/00_button_left.png b/res/common/usr/share/osp/bitmaps/480x800/00_button_left.png
index 00bd91d..493870a 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/480x800/00_button_left.png and b/res/common/usr/share/osp/bitmaps/480x800/00_button_left.png differ

diff --git a/res/common/usr/share/osp/bitmaps/480x800/00_button_right.png b/res/common/usr/share/osp/bitmaps/480x800/00_button_right.png
index 8cf0f3b..028a11a 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/480x800/00_button_right.png and b/res/common/usr/share/osp/bitmaps/480x800/00_button_right.png differ

diff --git a/src/ui/inc/FUi_ResourceEditDateConfig.h b/src/ui/inc/FUi_ResourceEditDateConfig.h
index 8aa937b..252e2db 100644 (file)
--- a/src/ui/inc/FUi_ResourceEditDateConfig.h
+++ b/src/ui/inc/FUi_ResourceEditDateConfig.h
@@ -30,13 +30,11 @@ DECLARE_UI_CONFIG(EDITDATE);
        DECLARE_COLOR_CONFIG(TEXT_DISABLED,3);
        DECLARE_COLOR_CONFIG(TITLE_TEXT_NORMAL,4);
        DECLARE_COLOR_CONFIG(TITLE_TEXT_DISABLED,5);
-       //DECLARE_COLOR_CONFIG(DIVIDER_LEFT_HALF,6);
-       //DECLARE_COLOR_CONFIG(DIVIDER_RIGHT_HALF,7);
-       DECLARE_COLOR_CONFIG(CONTENT_BG_NORMAL,8);
-       DECLARE_COLOR_CONFIG(CONTENT_BG_PRESSED,9);
-       DECLARE_COLOR_CONFIG(CONTENT_BG_DISABLED,10);
-       DECLARE_COLOR_CONFIG(CONTENT_BG_HIGHLIGHTED,11);
-       DECLARE_COLOR_CONFIG(TEXT_HIGHLIGHTED, 12);
+       DECLARE_COLOR_CONFIG(CONTENT_BG_NORMAL,6);
+       DECLARE_COLOR_CONFIG(CONTENT_BG_PRESSED,7);
+       DECLARE_COLOR_CONFIG(CONTENT_BG_DISABLED,8);
+       DECLARE_COLOR_CONFIG(CONTENT_BG_HIGHLIGHTED,9);
+       DECLARE_COLOR_CONFIG(TEXT_HIGHLIGHTED,10);
        DECLARE_IMAGE_CONFIG(CONTENT_BG_NORMAL,1);
        DECLARE_IMAGE_CONFIG(CONTENT_BG_PRESSED,2);
        DECLARE_IMAGE_CONFIG(CONTENT_BG_DISABLED,3);

diff --git a/src/ui/resource/FUi_ResourceColorPickerConfig.cpp b/src/ui/resource/FUi_ResourceColorPickerConfig.cpp
index 36e1167..3fc337b 100644 (file)
--- a/src/ui/resource/FUi_ResourceColorPickerConfig.cpp
+++ b/src/ui/resource/FUi_ResourceColorPickerConfig.cpp
@@ -41,8 +41,8 @@ START_UI_CONFIG(COLORPICKER);
        ADD_IMAGE_CONFIG(ARROW_BUTTON_BG_PRESSED, #00_button_01.#.png);
        ADD_IMAGE_CONFIG(ARROW_BUTTON_BG_DISABLED, #00_button_01.#.png);
        ADD_IMAGE_CONFIG(ARROW_BUTTON_BG_EFFECT_NORMAL, #00_button_01_ef.#.png);
-       ADD_IMAGE_CONFIG(ARROW_BUTTON_BG_EFFECT_PRESSED, #00_button_01_ef_press.#.png);
-       ADD_IMAGE_CONFIG(ARROW_BUTTON_BG_EFFECT_DISABLED, #00_button_01_ef_dim.#.png);
+       ADD_IMAGE_CONFIG(ARROW_BUTTON_BG_EFFECT_PRESSED, #00_button_01_press_ef.#.png);
+       ADD_IMAGE_CONFIG(ARROW_BUTTON_BG_EFFECT_DISABLED, #00_button_01_dim_ef.#.png);
        ADD_IMAGE_CONFIG(LEFT_ARROW_BUTTON_NORMAL, #00_button_left.png);
        ADD_IMAGE_CONFIG(LEFT_ARROW_BUTTON_PRESSED, #00_button_left.png);
        ADD_IMAGE_CONFIG(LEFT_ARROW_BUTTON_DISABLED, #00_button_left.png);

diff --git a/src/ui/resource/FUi_ResourceEditDateConfig.cpp b/src/ui/resource/FUi_ResourceEditDateConfig.cpp
index d712a29..a66186f 100644 (file)
--- a/src/ui/resource/FUi_ResourceEditDateConfig.cpp
+++ b/src/ui/resource/FUi_ResourceEditDateConfig.cpp
@@ -30,8 +30,6 @@ START_UI_CONFIG(EDITDATE);
        ADD_COLOR_CONFIG(TEXT_HIGHLIGHTED, $F011L1);
        ADD_COLOR_CONFIG(TITLE_TEXT_NORMAL, $B052L5);
        ADD_COLOR_CONFIG(TITLE_TEXT_DISABLED, $B052L5);
-       //ADD_COLOR_CONFIG(DIVIDER_LEFT_HALF, $B0224);
-       //ADD_COLOR_CONFIG(DIVIDER_RIGHT_HALF, $B0222);
        ADD_COLOR_CONFIG(CONTENT_BG_NORMAL, $W011);
        ADD_COLOR_CONFIG(CONTENT_BG_PRESSED, $B042);
        ADD_COLOR_CONFIG(CONTENT_BG_DISABLED, $W011D);