The systel color table is updated to Ver.20130329.

Change-Id: I2a53a860191f38af2a0561392e41df2d99ff7cda
Signed-off-by: “Bumseung <bumseung.cho@samsung.com>

diff --git a/res/common/usr/share/osp/themes/black.xml b/res/common/usr/share/osp/themes/black.xml
index 3fac1fa..f718650 100644 (file)
--- a/res/common/usr/share/osp/themes/black.xml
+++ b/res/common/usr/share/osp/themes/black.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
-<Theme Name="Black" Version= "Tizen2.1_20130313">\r
+<Theme Name="Tizen_Black" Version= "Tizen2.1_20130329">\r
        <Palette Name="BASIC">\r
                <Color foreground="#FFF9F9F9"/>\r
                <Color background="#FF000000"/>\r
@@ -23,17 +23,17 @@
                <Color B0222="#26FFFFFF"/>\r
                <Color B0223="#FF2D2D2D"/>\r
                <Color B0224="#FF0C0F14"/>\r
-               <Color B0225="#00000000"/>\r
-               <Color B0226="#00000000"/>\r
-               <Color B0227="#00000000"/>\r
-               <Color B0228="#00000000"/>\r
+               <Color B0225="#FF2A5181"/>\r
+               <Color B0226="#FF4B73A3"/>\r
+               <Color B0227="#FF000000"/>\r
+               <Color B0228="#7FCFCFCF"/>\r
                <Color B0232="#FF1A5274"/>\r
                <Color B0233="#00000000"/>\r
                <Color B031="#00000000"/>\r
-               <Color B041="#FF70A9EE"/>\r
+               <Color B041="#1970A9EE"/>\r
                <Color B041P="#FFFFFFFF"/>\r
                <Color B042="#FF3B73B6"/>\r
-               <Color B043="#00000000"/>\r
+               <Color B043="#FF5787C2"/>\r
                <Color B044="#FF2A89C2"/>\r
                <Color B0511="#FF202327"/>\r
                <Color B0512="#00000000"/>\r
@@ -41,16 +41,17 @@
                <Color B0514="#00000000"/>\r
                <Color B0514P1="#CC000000"/>\r
                <Color B0514P2="#00000000"/>\r
-               <Color B0515="#FF202327"/>\r
+               <Color B0515L1="#FF202327"/>\r
+               <Color B0515L2="#7F626262"/>\r
                <Color B0516="#00000000"/>\r
                <Color B0517="#00000000"/>\r
                <Color B0517P1="#00000000"/>\r
                <Color B0517P2="#00000000"/>\r
-               <Color B0518="#00000000"/>\r
+               <Color B0518="#FF2E4468"/>\r
                <Color B0518P="#00000000"/>\r
                <Color B0519="#FF202327"/>\r
-               <Color B0520="#FF333539"/>\r
-               <Color B0520P="#FF333539"/>\r
+               <Color B0520="#FF2E4468"/>\r
+               <Color B0520P="#FF3C649B"/>\r
                <Color B052L1="#FFBABABA"/>\r
                <Color B052L1P="#FF4D8FDE"/>\r
                <Color B052L1D="#4CBABABA"/>\r
@@ -63,15 +64,15 @@
                <Color B052L4D="#4CC7C7C7"/>\r
                <Color B052L5="#FF70A9EE"/>\r
                <Color B052L6="#FFBABABA"/>\r
-               <Color B052L6P="#FF70A9EE"/>\r
+               <Color B052L6P="#1970A9EE"/>\r
                <Color B052L7="#FF4093F7"/>\r
-               <Color B052L8="#FFBABABA"/>\r
-               <Color B052L8P="#FF4D8FDE"/>\r
-               <Color B052L8D="#4CBABABA"/>\r
-               <Color B052L9="#FFBABABA"/>\r
-               <Color B052L9P="#FF4D8FDE"/>\r
-               <Color B052L9D="#4CBABABA"/>\r
-               <Color B052L10="#00000000"/>\r
+               <Color B052L8="#FFFFFFFF"/>\r
+               <Color B052L8P="#FF4093F7"/>\r
+               <Color B052L8D="#4CFFFFFF"/>\r
+               <Color B052L9="#FFE4E4E4"/>\r
+               <Color B052L9P="#FFFFFFFF"/>\r
+               <Color B052L9D="#4CE4E4E4"/>\r
+               <Color B052L10="#FFBABABA"/>\r
                <Color B0531="#FF202327"/>\r
                <Color B0532="#00000000"/>\r
                <Color B0533="#00000000"/>\r
@@ -98,7 +99,7 @@
                <Color B061L3="#00000000"/>\r
                <Color B061L4="#FF444444"/>\r
                <Color B061L5="#FF444444"/>\r
-               <Color B061L6="#00000000"/>\r
+               <Color B061L6="#FF17191C"/>\r
                <Color B0621L1="#00000000"/>\r
                <Color B0621L2="#00000000"/>\r
                <Color B0622L1="#FF2D2D2D"/>\r
@@ -144,12 +145,12 @@
                <Color B0725="#FF3B73B6"/>\r
                <Color B0731="#FF3B73B6"/>\r
                <Color B0732="#FFFFFFFF"/>\r
-               <Color B0741="#00000000"/>\r
-               <Color B0742="#00000000"/>\r
-               <Color B0743="#00000000"/>\r
-               <Color B0744="#00000000"/>\r
+               <Color B0741="#FFD7D7D7"/>\r
+               <Color B0742="#FF70A9EE"/>\r
+               <Color B0743="#FF21344A"/>\r
+               <Color B0744="#FFC3C0B9"/>\r
                <Color B0745="#00000000"/>\r
-               <Color B0751="#00000000"/>\r
+               <Color B0751="#FF3B73B6"/>\r
                <Color F011L1="#FFD7D7D7"/>\r
                <Color F011L1P="#FFFFFFFF"/>\r
                <Color F011L1D="#4CD7D7D7"/>\r
@@ -163,7 +164,7 @@
                <Color F011L6="#00000000"/>\r
                <Color F011L7="#FF808080"/>\r
                <Color F011L7D="#CC808080"/>\r
-               <Color F011L8="#00000000"/>\r
+               <Color F011L8="#FFC24747"/>\r
                <Color F011L9="#FFFFFFFF"/>\r
                <Color F011L10="#FFF9F9F9"/>\r
                <Color F011L11="#FF808080"/>\r
@@ -200,8 +201,8 @@
                <Color F032L2="#FFF8F6EF"/>\r
                <Color F032L2P="#FFFFFFFF"/>\r
                <Color F032L2D="#4CF8F6EF"/>\r
-               <Color F032L3="#00000000"/>\r
-               <Color F032L3P="#00000000"/>\r
+               <Color F032L3="#FFF9F9F9"/>\r
+               <Color F032L3P="#FFF9F9F9"/>\r
                <Color F041i="#FFA8A7A7"/>\r
                <Color F041iD="#4CA8A7A7"/>\r
                <Color F051="#FFD7D7D7"/>\r
@@ -240,7 +241,8 @@
                <Color W062L3D="#4C615F5B"/>\r
                <Color W062L4="#FF70A9EE"/>\r
                <Color W062L4D="#4C70A9EE"/>\r
-               <Color W063="#FFC5C5C5"/>\r
+               <Color W0631="#FFC5C5C5"/>\r
+               <Color W0632="#FF4C5158"/>\r
                <Color W0641="#FF31363C"/>\r
                <Color W0641P="#FF4093F7"/>\r
                <Color W0641D="#FF2D2E2F"/>\r
@@ -252,7 +254,7 @@
                <Color W0721="#00000000"/>\r
                <Color W0811="#FF5787C2"/>\r
                <Color W0812="#00000000"/>\r
-               <Color W0813="#FF3B73B6"/>\r
+               <Color W0813="#FF595959"/>\r
                <Color W082="#00000000"/>\r
                <Color W083="#00000000"/>\r
                <Color W084="#B2FFFFFF"/>\r
@@ -260,11 +262,11 @@
                <Color W085="#00000000"/>\r
                <Color W091="#FF444444"/>\r
                <Color W092="#FFFFFFFF"/>\r
-               <Color W101="#00000000"/>\r
-               <Color W111="#00000000"/>\r
-               <Color W1121="#00000000"/>\r
-               <Color W1122="#00000000"/>\r
-               <Color W1123="#00000000"/>\r
+               <Color W101="#FF4884D6"/>\r
+               <Color W111="#FFC8CEDB"/>\r
+               <Color W1121="#FF000000"/>\r
+               <Color W1122="#FFFFFFFF"/>\r
+               <Color W1123="#4C000000"/>\r
                <Color W1211="#00000000"/>\r
                <Color W1212="#00000000"/>\r
                <Color W1221="#00000000"/>\r
@@ -276,7 +278,7 @@
                <Color W151="#FF5B5656"/>\r
                <Color W152="#FF878787"/>\r
                <Color W153="#FF3B73B6"/>\r
-               <Color W154="#00000000"/>\r
+               <Color W154="#FF878787"/>\r
                <Color W161="#FF3B73B6"/>\r
        </Palette>\r
 </Theme>\r

diff --git a/res/common/usr/share/osp/themes/default.xml b/res/common/usr/share/osp/themes/default.xml
index c04f7d5..6b54900 100755 (executable)
--- a/res/common/usr/share/osp/themes/default.xml
+++ b/res/common/usr/share/osp/themes/default.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
-<Theme Name="White" Version= "Tizen2.1_20130313">\r
+<Theme Name="System_Default" Version= "Tizen2.1_20130329">\r
        <Palette Name="BASIC">\r
                <Color foreground="#FF000000"/>\r
                <Color background="#FFF8F6EF"/>\r
@@ -41,18 +41,19 @@
                <Color B0514="#00000000"/>\r
                <Color B0514P1="#FFA9A597"/>\r
                <Color B0514P2="#00000000"/>\r
-               <Color B0515="#FFF8F6EF"/>\r
+               <Color B0515L1="#FFF8F6EF"/>\r
+               <Color B0515L2="#7F454442"/>\r
                <Color B0516="#00000000"/>\r
                <Color B0517="#00000000"/>\r
                <Color B0517P1="#00000000"/>\r
                <Color B0517P2="#00000000"/>\r
                <Color B0518="#003567A3"/>\r
-               <Color B0518P="#FF000000"/>\r
+               <Color B0518P="#00000000"/>\r
                <Color B0519="#FFFFFFFF"/>\r
                <Color B0520="#FF3567A3"/>\r
                <Color B0520P="#FF2A89C2"/>\r
-               <Color B052L1="#FF656565"/>\r
-               <Color B052L1P="#FF4D8FDE"/>\r
+               <Color B052L1="#FF737373"/>\r
+               <Color B052L1P="#FF4093F7"/>\r
                <Color B052L1D="#4C656565"/>\r
                <Color B052L2="#FF525252"/>\r
                <Color B052L2P="#005787B8"/>\r
@@ -148,7 +149,7 @@
                <Color B0742="#FF3B73B6"/>\r
                <Color B0743="#FFE6E3D8"/>\r
                <Color B0744="#FFC5C2B7"/>\r
-               <Color B0745="#FF4177B8"/>\r
+               <Color B0745="#00000000"/>\r
                <Color B0751="#FF3B73B6"/>\r
                <Color F011L1="#FF000000"/>\r
                <Color F011L1P="#FFFFFFFF"/>\r
@@ -163,7 +164,7 @@
                <Color F011L6="#00000000"/>\r
                <Color F011L7="#FF808080"/>\r
                <Color F011L7D="#CC808080"/>\r
-               <Color F011L8="#FF3B73B6"/>\r
+               <Color F011L8="#FFC24747"/>\r
                <Color F011L9="#FFFFFFFF"/>\r
                <Color F011L10="#FFF9F9F9"/>\r
                <Color F011L11="#FF808080"/>\r
@@ -194,12 +195,12 @@
                <Color F031L3="#FFFFFFFF"/>\r
                <Color F031L3P="#FFFFFFFF"/>\r
                <Color F031L3D="#4CFFFFFF"/>\r
-               <Color F032L1="#FF656565"/>\r
+               <Color F032L1="#FF808080"/>\r
                <Color F032L1P="#FFFFFFFF"/>\r
-               <Color F032L1D="#4C656565"/>\r
-               <Color F032L2="#FFF8F6EF"/>\r
+               <Color F032L1D="#4C808080"/>\r
+               <Color F032L2="#FFFFFFFF"/>\r
                <Color F032L2P="#FFFFFFFF"/>\r
-               <Color F032L2D="#4CF8F6EF"/>\r
+               <Color F032L2D="#4CFFFFFF"/>\r
                <Color F032L3="#FFF9F9F9"/>\r
                <Color F032L3P="#FFF9F9F9"/>\r
                <Color F041i="#FF808080"/>\r
@@ -240,7 +241,8 @@
                <Color W062L3D="#4CD8D7D2"/>\r
                <Color W062L4="#FF3677C3"/>\r
                <Color W062L4D="#4C3677C3"/>\r
-               <Color W063="#FF656565"/>\r
+               <Color W0631="#FFFFFFFF"/>\r
+               <Color W0632="#FF656565"/>\r
                <Color W0641="#FFE0DAD1"/>\r
                <Color W0641P="#FF5288C9"/>\r
                <Color W0641D="#FFBFBFBF"/>\r
@@ -257,7 +259,7 @@
                <Color W083="#00000000"/>\r
                <Color W084="#B2FFFFFF"/>\r
                <Color W084P="#FFFFFFFF"/>\r
-               <Color W085="#33E2EFFF"/>\r
+               <Color W085="#00000000"/>\r
                <Color W091="#FF444444"/>\r
                <Color W092="#FFFFFFFF"/>\r
                <Color W101="#FF5893E4"/>\r
@@ -265,8 +267,8 @@
                <Color W1121="#FF000000"/>\r
                <Color W1122="#FFFFFFFF"/>\r
                <Color W1123="#4C000000"/>\r
-               <Color W1211="#FFECF0F2"/>\r
-               <Color W1212="#FFFFFFFF"/>\r
+               <Color W1211="#00000000"/>\r
+               <Color W1212="#00000000"/>\r
                <Color W1221="#00000000"/>\r
                <Color W1222="#00000000"/>\r
                <Color W1223="#00000000"/>\r

diff --git a/res/common/usr/share/osp/themes/white.xml b/res/common/usr/share/osp/themes/white.xml
index c04f7d5..8f76084 100755 (executable)
--- a/res/common/usr/share/osp/themes/white.xml
+++ b/res/common/usr/share/osp/themes/white.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
-<Theme Name="White" Version= "Tizen2.1_20130313">\r
+<Theme Name="Tizen_White" Version= "Tizen2.1_20130329">\r
        <Palette Name="BASIC">\r
                <Color foreground="#FF000000"/>\r
                <Color background="#FFF8F6EF"/>\r
@@ -41,18 +41,19 @@
                <Color B0514="#00000000"/>\r
                <Color B0514P1="#FFA9A597"/>\r
                <Color B0514P2="#00000000"/>\r
-               <Color B0515="#FFF8F6EF"/>\r
+               <Color B0515L1="#FFF8F6EF"/>\r
+               <Color B0515L2="#7F454442"/>\r
                <Color B0516="#00000000"/>\r
                <Color B0517="#00000000"/>\r
                <Color B0517P1="#00000000"/>\r
                <Color B0517P2="#00000000"/>\r
                <Color B0518="#003567A3"/>\r
-               <Color B0518P="#FF000000"/>\r
+               <Color B0518P="#00000000"/>\r
                <Color B0519="#FFFFFFFF"/>\r
                <Color B0520="#FF3567A3"/>\r
                <Color B0520P="#FF2A89C2"/>\r
-               <Color B052L1="#FF656565"/>\r
-               <Color B052L1P="#FF4D8FDE"/>\r
+               <Color B052L1="#FF737373"/>\r
+               <Color B052L1P="#FF4093F7"/>\r
                <Color B052L1D="#4C656565"/>\r
                <Color B052L2="#FF525252"/>\r
                <Color B052L2P="#005787B8"/>\r
@@ -148,7 +149,7 @@
                <Color B0742="#FF3B73B6"/>\r
                <Color B0743="#FFE6E3D8"/>\r
                <Color B0744="#FFC5C2B7"/>\r
-               <Color B0745="#FF4177B8"/>\r
+               <Color B0745="#00000000"/>\r
                <Color B0751="#FF3B73B6"/>\r
                <Color F011L1="#FF000000"/>\r
                <Color F011L1P="#FFFFFFFF"/>\r
@@ -163,7 +164,7 @@
                <Color F011L6="#00000000"/>\r
                <Color F011L7="#FF808080"/>\r
                <Color F011L7D="#CC808080"/>\r
-               <Color F011L8="#FF3B73B6"/>\r
+               <Color F011L8="#FFC24747"/>\r
                <Color F011L9="#FFFFFFFF"/>\r
                <Color F011L10="#FFF9F9F9"/>\r
                <Color F011L11="#FF808080"/>\r
@@ -194,12 +195,12 @@
                <Color F031L3="#FFFFFFFF"/>\r
                <Color F031L3P="#FFFFFFFF"/>\r
                <Color F031L3D="#4CFFFFFF"/>\r
-               <Color F032L1="#FF656565"/>\r
+               <Color F032L1="#FF808080"/>\r
                <Color F032L1P="#FFFFFFFF"/>\r
-               <Color F032L1D="#4C656565"/>\r
-               <Color F032L2="#FFF8F6EF"/>\r
+               <Color F032L1D="#4C808080"/>\r
+               <Color F032L2="#FFFFFFFF"/>\r
                <Color F032L2P="#FFFFFFFF"/>\r
-               <Color F032L2D="#4CF8F6EF"/>\r
+               <Color F032L2D="#4CFFFFFF"/>\r
                <Color F032L3="#FFF9F9F9"/>\r
                <Color F032L3P="#FFF9F9F9"/>\r
                <Color F041i="#FF808080"/>\r
@@ -240,7 +241,8 @@
                <Color W062L3D="#4CD8D7D2"/>\r
                <Color W062L4="#FF3677C3"/>\r
                <Color W062L4D="#4C3677C3"/>\r
-               <Color W063="#FF656565"/>\r
+               <Color W0631="#FFFFFFFF"/>\r
+               <Color W0632="#FF656565"/>\r
                <Color W0641="#FFE0DAD1"/>\r
                <Color W0641P="#FF5288C9"/>\r
                <Color W0641D="#FFBFBFBF"/>\r
@@ -257,7 +259,7 @@
                <Color W083="#00000000"/>\r
                <Color W084="#B2FFFFFF"/>\r
                <Color W084P="#FFFFFFFF"/>\r
-               <Color W085="#33E2EFFF"/>\r
+               <Color W085="#00000000"/>\r
                <Color W091="#FF444444"/>\r
                <Color W092="#FFFFFFFF"/>\r
                <Color W101="#FF5893E4"/>\r
@@ -265,8 +267,8 @@
                <Color W1121="#FF000000"/>\r
                <Color W1122="#FFFFFFFF"/>\r
                <Color W1123="#4C000000"/>\r
-               <Color W1211="#FFECF0F2"/>\r
-               <Color W1212="#FFFFFFFF"/>\r
+               <Color W1211="#00000000"/>\r
+               <Color W1212="#00000000"/>\r
                <Color W1221="#00000000"/>\r
                <Color W1222="#00000000"/>\r
                <Color W1223="#00000000"/>\r

diff --git a/src/ui/controls/FUiCtrl_Edit.cpp b/src/ui/controls/FUiCtrl_Edit.cpp
index 00b18a9..82ef0e7 100644 (file)
--- a/src/ui/controls/FUiCtrl_Edit.cpp
+++ b/src/ui/controls/FUiCtrl_Edit.cpp
@@ -2354,16 +2354,16 @@ _Edit::IsCustomDefaultBackgroundBitmap(EditStatus status) const
        switch (status)
        {
        case EDIT_STATUS_NORMAL:
-               isCustomBitmap = IS_CUSTOM_BITMAP(EDIT::BG_NORMAL)
+               isCustomBitmap = IS_CUSTOM_BITMAP(EDIT::BG_NORMAL);
                break;
        case EDIT_STATUS_DISABLED:
-               isCustomBitmap = IS_CUSTOM_BITMAP(EDIT::BG_DISABLED)
+               isCustomBitmap = IS_CUSTOM_BITMAP(EDIT::BG_DISABLED);
                break;
        case EDIT_STATUS_HIGHLIGHTED:
-               isCustomBitmap = IS_CUSTOM_BITMAP(EDIT::BG_HIGHLIGHTED)
+               isCustomBitmap = IS_CUSTOM_BITMAP(EDIT::BG_HIGHLIGHTED);
                break;
        case EDIT_STATUS_PRESSED:
-               isCustomBitmap = IS_CUSTOM_BITMAP(EDIT::BG_PRESSED)
+               isCustomBitmap = IS_CUSTOM_BITMAP(EDIT::BG_PRESSED);
                break;
        default:
                isCustomBitmap = false;

diff --git a/src/ui/controls/FUiCtrl_EditPresenter.cpp b/src/ui/controls/FUiCtrl_EditPresenter.cpp
index cee2698..47d58f5 100755 (executable)
--- a/src/ui/controls/FUiCtrl_EditPresenter.cpp
+++ b/src/ui/controls/FUiCtrl_EditPresenter.cpp
@@ -1323,14 +1323,14 @@ _EditPresenter::DrawChangeableBackground(Canvas& canvas, bool focused, int bitma
        if (borderRoundEnable)
        {
                pEditBgBitmap = null;
-               r = GET_BITMAP_CONFIG_N(EDIT::BG_ROUND_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, pEditBgBitmap)
+               r = GET_BITMAP_CONFIG_N(EDIT::BG_ROUND_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, pEditBgBitmap);
                SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , r, "Failed to load bitmap");
        }
 
        bitmapColor = __pEdit->GetColor(editStatus);
        if (__groupStyle != GROUP_STYLE_NONE)
        {
-               GET_COLOR_CONFIG(PANEL::GROUPED_STYLE_BG_NORMAL, bitmapColor);          
+               GET_COLOR_CONFIG(PANEL::GROUPED_STYLE_BG_NORMAL, bitmapColor);
        }
 
        pReplacementColorBackgroundBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pEditBgBitmap, Color::GetColor(COLOR_ID_MAGENTA), bitmapColor);
@@ -1353,7 +1353,7 @@ _EditPresenter::DrawChangeableBackground(Canvas& canvas, bool focused, int bitma
                if (borderRoundEnable)
                {
                        pEditBgEffectBitmap = null;
-                       r = GET_BITMAP_CONFIG_N(EDIT::BG_ROUND_EFFECT, BITMAP_PIXEL_FORMAT_ARGB8888, pEditBgEffectBitmap)
+                       r = GET_BITMAP_CONFIG_N(EDIT::BG_ROUND_EFFECT, BITMAP_PIXEL_FORMAT_ARGB8888, pEditBgEffectBitmap);
                        SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , r, "Failed to load bitmap");
                }
 

diff --git a/src/ui/controls/FUiCtrl_TableViewItem.cpp b/src/ui/controls/FUiCtrl_TableViewItem.cpp
index 7383f8e..4ca9d0d 100644 (file)
--- a/src/ui/controls/FUiCtrl_TableViewItem.cpp
+++ b/src/ui/controls/FUiCtrl_TableViewItem.cpp
@@ -2420,7 +2420,7 @@ _TableViewItem::DrawOnOffButton(void)
                }
                else
                {
-                       r = GET_BITMAP_CONFIG_N(TABLEVIEW::ONOFFBUTTON_OFF_DISABLED, BITMAP_PIXEL_FORMAT_ARGB8888, pOnOffButton)
+                       r = GET_BITMAP_CONFIG_N(TABLEVIEW::ONOFFBUTTON_OFF_DISABLED, BITMAP_PIXEL_FORMAT_ARGB8888, pOnOffButton);
                }
        }
        SysTryCatch(NID_UI_CTRL, (r == E_SUCCESS) && (pOnOffButton != null), , E_SYSTEM, "[E_SYSTEM] OnOffButton_On image load failed");

diff --git a/src/ui/inc/FUi_ResourceManager.h b/src/ui/inc/FUi_ResourceManager.h
index d7acf4c..508607c 100644 (file)
--- a/src/ui/inc/FUi_ResourceManager.h
+++ b/src/ui/inc/FUi_ResourceManager.h
@@ -128,34 +128,34 @@ enum _ResourceFeedbackPattern
        }}//Tizen::Ui::Controls::__Internal
 
 #define GET_SHAPE_CONFIG(shapeId, orientation, x)\
-       Tizen::Ui::_ResourceManager::GetInstance()->GetShape(Tizen::Ui::_Resource::_##shapeId##_SHAPE, orientation, x);
+       Tizen::Ui::_ResourceManager::GetInstance()->GetShape(Tizen::Ui::_Resource::_##shapeId##_SHAPE, orientation, x)
 
 #define GET_DIMENSION_CONFIG(dimensionId, orientation, x)\
-       Tizen::Ui::_ResourceManager::GetInstance()->GetDimension(Tizen::Ui::_Resource::_##dimensionId##_DIMENSION, orientation, x);
+       Tizen::Ui::_ResourceManager::GetInstance()->GetDimension(Tizen::Ui::_Resource::_##dimensionId##_DIMENSION, orientation, x)
 
 #define GET_COLOR_CONFIG(colorId, x) \
-       Tizen::Ui::_ResourceManager::GetInstance()->GetColor(Tizen::Ui::_Resource::_##colorId##_COLOR, x);
+       Tizen::Ui::_ResourceManager::GetInstance()->GetColor(Tizen::Ui::_Resource::_##colorId##_COLOR, x)
 
 #define GET_BITMAP_CONFIG_N(bitmapId, pixelFormat, pOutBitmap)\
-       Tizen::Ui::_ResourceManager::GetInstance()->GetBitmapN(Tizen::Ui::_Resource::_##bitmapId##_IMAGE, pixelFormat, _CONTROL_ORIENTATION_PORTRAIT, pOutBitmap);
+       Tizen::Ui::_ResourceManager::GetInstance()->GetBitmapN(Tizen::Ui::_Resource::_##bitmapId##_IMAGE, pixelFormat, _CONTROL_ORIENTATION_PORTRAIT, pOutBitmap)
 
 #define GET_STRING_CONFIG(stringId, string)\
-       Tizen::Ui::_ResourceManager::GetInstance()->GetString(#stringId, string);
+       Tizen::Ui::_ResourceManager::GetInstance()->GetString(#stringId, string)
 
 #define GET_FIXED_VALUE_CONFIG(fixedValueId, orientation, x)\
-       Tizen::Ui::_ResourceManager::GetInstance()->GetFixedValue(Tizen::Ui::_Resource::_##fixedValueId##_FIXED_VALUE, orientation, x);
+       Tizen::Ui::_ResourceManager::GetInstance()->GetFixedValue(Tizen::Ui::_Resource::_##fixedValueId##_FIXED_VALUE, orientation, x)
 
 #define GET_ANIMATION_CONFIG_N(animationId, x)\
-       Tizen::Ui::_ResourceManager::GetInstance()->GetAnimationN(Tizen::Ui::_Resource::_##animationId##_ANIMATION, x);
+       Tizen::Ui::_ResourceManager::GetInstance()->GetAnimationN(Tizen::Ui::_Resource::_##animationId##_ANIMATION, x)
 
 #define IS_CUSTOM_BITMAP(bitmapId) \
-       Tizen::Ui::_ResourceManager::GetInstance()->IsCustomBitmap(Tizen::Ui::_Resource::_##bitmapId##_IMAGE);
+       Tizen::Ui::_ResourceManager::GetInstance()->IsCustomBitmap(Tizen::Ui::_Resource::_##bitmapId##_IMAGE)
 
 #define IS_CUSTOM_COLOR(colorId) \
-       Tizen::Ui::_ResourceManager::GetInstance()->IsCustomColor(Tizen::Ui::_Resource::_##colorId##_COLOR);
+       Tizen::Ui::_ResourceManager::GetInstance()->IsCustomColor(Tizen::Ui::_Resource::_##colorId##_COLOR)
 
 #define PLAY_FEEDBACK(pattern) \
-       Tizen::Ui::_ResourceManager::GetInstance()->PlayFeedback(pattern);
+       Tizen::Ui::_ResourceManager::GetInstance()->PlayFeedback(pattern)
 
 #define IS_PLAYED_FEEDBACK() \
        Tizen::Ui::_ResourceManager::GetInstance()->IsFeedbackPlayed()

diff --git a/src/ui/resource/FUi_ResourceConfigParser.cpp b/src/ui/resource/FUi_ResourceConfigParser.cpp
index ea1da19..5404e61 100755 (executable)
--- a/src/ui/resource/FUi_ResourceConfigParser.cpp
+++ b/src/ui/resource/FUi_ResourceConfigParser.cpp
@@ -629,6 +629,10 @@ ConfigParser::AddImage(const xmlChar** pAttributes)
                {
                        if (pAttributes[++i] != null)
                        {
+                               if (strlen((char*)pAttributes) < 5)
+                               {
+                                       return;
+                               }
                                char* key = null;
                                int currentAttributeLength = strlen(__pCurrentAttribute);
                                int currentKeyLength = strlen((char*) pAttributes[i - 1]);

diff --git a/src/ui/resource/FUi_ResourceFooterConfig.cpp b/src/ui/resource/FUi_ResourceFooterConfig.cpp
index 7c1201d..0eac87b 100755 (executable)
--- a/src/ui/resource/FUi_ResourceFooterConfig.cpp
+++ b/src/ui/resource/FUi_ResourceFooterConfig.cpp
@@ -24,7 +24,7 @@
 START_UI_CONFIG(FOOTER);
 {
        // COLOR
-       ADD_COLOR_CONFIG(BG_NORMAL, $B0515);
+       ADD_COLOR_CONFIG(BG_NORMAL, $B0515L1);
        ADD_COLOR_CONFIG(TRANSLUCENT_BG_NORMAL, $B013);
 
        ADD_COLOR_CONFIG(BUTTON_BG_NORMAL, $B0511);
@@ -48,11 +48,11 @@ START_UI_CONFIG(FOOTER);
        ADD_COLOR_CONFIG(BUTTON_TRANSLUCENT_TEXT_HIGHLIGHTED, $B052L8P);
 
 
-       ADD_COLOR_CONFIG(SEGMENTED_ITEM_BG_NORMAL, $B0515); // $B0543 is 0x00000000, transparent
-       ADD_COLOR_CONFIG(SEGMENTED_ITEM_BG_DISABLED, $B0515);
+       ADD_COLOR_CONFIG(SEGMENTED_ITEM_BG_NORMAL, $B0515L1); // $B0543 is 0x00000000, transparent
+       ADD_COLOR_CONFIG(SEGMENTED_ITEM_BG_DISABLED, $B0515L1);
        ADD_COLOR_CONFIG(SEGMENTED_ITEM_BG_PRESSED, $B0514P1);
        ADD_COLOR_CONFIG(SEGMENTED_ITEM_BG_HIGHLIGHTED, $B0514P1);
-       ADD_COLOR_CONFIG(SEGMENTED_ITEM_BG_SELECTED, $B0515);
+       ADD_COLOR_CONFIG(SEGMENTED_ITEM_BG_SELECTED, $B0515L1);
 
        ADD_COLOR_CONFIG(SEGMENTED_ITEM_TRANSLUCENT_BG_NORMAL, $B013);
        ADD_COLOR_CONFIG(SEGMENTED_ITEM_TRANSLUCENT_BG_DISABLED, $B013);
@@ -72,11 +72,11 @@ START_UI_CONFIG(FOOTER);
        ADD_COLOR_CONFIG(SEGMENTED_ITEM_TRANSLUCENT_TEXT_HIGHLIGHTED, $B052L8P);
        ADD_COLOR_CONFIG(SEGMENTED_ITEM_TRANSLUCENT_TEXT_SELECTED, $B052L8P);
 
-       ADD_COLOR_CONFIG(TAB_ITEM_BG_NORMAL, $B0515);
-       ADD_COLOR_CONFIG(TAB_ITEM_BG_DISABLED, $B0515);
+       ADD_COLOR_CONFIG(TAB_ITEM_BG_NORMAL, $B0515L1);
+       ADD_COLOR_CONFIG(TAB_ITEM_BG_DISABLED, $B0515L1);
        ADD_COLOR_CONFIG(TAB_ITEM_BG_PRESSED, $B0514P1);
        ADD_COLOR_CONFIG(TAB_ITEM_BG_HIGHLIGHTED, $B0514P1);
-       ADD_COLOR_CONFIG(TAB_ITEM_BG_SELECTED, $B0515);
+       ADD_COLOR_CONFIG(TAB_ITEM_BG_SELECTED, $B0515L1);
 
        ADD_COLOR_CONFIG(TAB_ITEM_TRANSLUCENT_BG_NORMAL, $B013);
        ADD_COLOR_CONFIG(TAB_ITEM_TRANSLUCENT_BG_DISABLED, $B013);

diff --git a/src/ui/resource/FUi_ResourceSliderConfig.cpp b/src/ui/resource/FUi_ResourceSliderConfig.cpp
index 51554b7..a0ec7f8 100755 (executable)
--- a/src/ui/resource/FUi_ResourceSliderConfig.cpp
+++ b/src/ui/resource/FUi_ResourceSliderConfig.cpp
@@ -39,7 +39,7 @@ START_UI_CONFIG(SLIDER);
        ADD_COLOR_CONFIG(HANDLE_NUMBER_TEXT_NORMAL, $W0611);
 
        ADD_COLOR_CONFIG(TITLE_TEXT_NORMAL, $F011L3);
-       ADD_COLOR_CONFIG(OVERLAY_BG_NORMAL, $W063);
+       ADD_COLOR_CONFIG(OVERLAY_BG_NORMAL, $W0632);
        ADD_COLOR_CONFIG(OVERLAY_TEXT_NORMAL, $F011L10);
 
        ADD_IMAGE_CONFIG(BAR_BG_NORMAL, #00_progress_bg.#.png);