apply color table

Change-Id: I4733076c0d02248b90536aedbfd3079888eb9fd3

diff --git a/src/ui/resource/FUi_ResourceButtonConfig.cpp b/src/ui/resource/FUi_ResourceButtonConfig.cpp
index 6e89474..49b12b5 100644 (file)
--- a/src/ui/resource/FUi_ResourceButtonConfig.cpp
+++ b/src/ui/resource/FUi_ResourceButtonConfig.cpp
@@ -26,7 +26,7 @@ START_UI_CONFIG(BUTTON);
        ADD_COLOR_CONFIG(BG_NORMAL, $W011);
        ADD_COLOR_CONFIG(BG_DISABLED, $W011);
        ADD_COLOR_CONFIG(BG_PRESSED, $B042);
-       ADD_COLOR_CONFIG(BG_HIGHLIGHTED, $B042);
+       ADD_COLOR_CONFIG(BG_HIGHLIGHTED, $W161);
 
        ADD_COLOR_CONFIG(TEXT_NORMAL, $F031L1);
        ADD_COLOR_CONFIG(TEXT_DISABLED, $F031L1D);

diff --git a/src/ui/resource/FUi_ResourceCheckButtonConfig.cpp b/src/ui/resource/FUi_ResourceCheckButtonConfig.cpp
index 9f7b816..6f0984b 100644 (file)
--- a/src/ui/resource/FUi_ResourceCheckButtonConfig.cpp
+++ b/src/ui/resource/FUi_ResourceCheckButtonConfig.cpp
@@ -30,30 +30,30 @@ START_UI_CONFIG(CHECKBUTTON);
        ADD_COLOR_CONFIG(BG_SELECTED, $B0217);
 
        ADD_COLOR_CONFIG(TEXT_NORMAL, $F011L1);
-       ADD_COLOR_CONFIG(TEXT_DISABLED, $F011L3);
-       ADD_COLOR_CONFIG(TEXT_PRESSED, $F031L1P);
+       ADD_COLOR_CONFIG(TEXT_DISABLED, $F011L1D);
+       ADD_COLOR_CONFIG(TEXT_PRESSED, $F011L1P);
        ADD_COLOR_CONFIG(TEXT_HIGHLIGHTED, $F011L1P);
        ADD_COLOR_CONFIG(TEXT_SELECTED, $F011L1);
 
        ADD_COLOR_CONFIG(TITLE_TEXT_NORMAL, $F011L1);
-       ADD_COLOR_CONFIG(TITLE_TEXT_DISABLED, $F011L3);
-       ADD_COLOR_CONFIG(TITLE_TEXT_PRESSED, $F031L1P);
+       ADD_COLOR_CONFIG(TITLE_TEXT_DISABLED, $F011L1D);
+       ADD_COLOR_CONFIG(TITLE_TEXT_PRESSED, $F011L1P);
        ADD_COLOR_CONFIG(TITLE_TEXT_HIGHLIGHTED, $F011L1P);
        ADD_COLOR_CONFIG(TITLE_TEXT_SELECTED, $F011L1);
 
        ADD_COLOR_CONFIG(DETAILED_ICON_BG_NORMAL, $W011);
        ADD_COLOR_CONFIG(DETAILED_ICON_BG_DISABLED, $W011);
        ADD_COLOR_CONFIG(DETAILED_ICON_BG_PRESSED, $B042);
-       ADD_COLOR_CONFIG(DETAILED_ICON_BG_HIGHLIGHTED, $B042);
+       ADD_COLOR_CONFIG(DETAILED_ICON_BG_HIGHLIGHTED, $W161);
        ADD_COLOR_CONFIG(DETAILED_ICON_BG_SELECTED, $W011);
 
        ADD_COLOR_CONFIG(DETAILED_ICON_TEXT_NORMAL, $F032L1);
-       ADD_COLOR_CONFIG(DETAILED_ICON_TEXT_DISABLED, $F032L1);
+       ADD_COLOR_CONFIG(DETAILED_ICON_TEXT_DISABLED, $F032L1D);
        ADD_COLOR_CONFIG(DETAILED_ICON_TEXT_PRESSED, $F032L1P);
        ADD_COLOR_CONFIG(DETAILED_ICON_TEXT_HIGHLIGHTED, $F032L1P);
        ADD_COLOR_CONFIG(DETAILED_ICON_TEXT_SELECTED, $F032L1);
 
-       ADD_COLOR_CONFIG(DIVIDER_LINE_LEFT_NORMAL, $B0223);
+       ADD_COLOR_CONFIG(DIVIDER_LINE_LEFT_NORMAL, $B0221);
        ADD_COLOR_CONFIG(DIVIDER_LINE_RIGHT_NORMAL, $B0222);
 
        // bitmap

diff --git a/src/ui/resource/FUi_ResourceFooterConfig.cpp b/src/ui/resource/FUi_ResourceFooterConfig.cpp
index 81b773c..ad8a474 100644 (file)
--- a/src/ui/resource/FUi_ResourceFooterConfig.cpp
+++ b/src/ui/resource/FUi_ResourceFooterConfig.cpp
@@ -27,28 +27,29 @@ START_UI_CONFIG(FOOTER);
        ADD_COLOR_CONFIG(BG_NORMAL, $B0515L1);
        ADD_COLOR_CONFIG(TRANSLUCENT_BG_NORMAL, $B013);
 
+       // $B0543 is 0x00000000, transparent
        ADD_COLOR_CONFIG(BUTTON_BG_NORMAL, $B0543);
        ADD_COLOR_CONFIG(BUTTON_BG_DISABLED, $B0543);
        ADD_COLOR_CONFIG(BUTTON_BG_PRESSED, $B0543);
        ADD_COLOR_CONFIG(BUTTON_BG_HIGHLIGHTED, $B0543);
 
-       ADD_COLOR_CONFIG(BUTTON_TRANSLUCENT_BG_NORMAL, $B013);
-       ADD_COLOR_CONFIG(BUTTON_TRANSLUCENT_BG_DISABLED, $B013);
-       ADD_COLOR_CONFIG(BUTTON_TRANSLUCENT_BG_PRESSED, $B013);
-       ADD_COLOR_CONFIG(BUTTON_TRANSLUCENT_BG_HIGHLIGHTED, $B013);
+       ADD_COLOR_CONFIG(BUTTON_TRANSLUCENT_BG_NORMAL, $B0543);
+       ADD_COLOR_CONFIG(BUTTON_TRANSLUCENT_BG_DISABLED, $B0543);
+       ADD_COLOR_CONFIG(BUTTON_TRANSLUCENT_BG_PRESSED, $B0543);
+       ADD_COLOR_CONFIG(BUTTON_TRANSLUCENT_BG_HIGHLIGHTED, $B0543);
 
        ADD_COLOR_CONFIG(BUTTON_TEXT_NORMAL, $B052L4);
-       ADD_COLOR_CONFIG(BUTTON_TEXT_DISABLED, $B052L4D); // temp $B052L4
-       ADD_COLOR_CONFIG(BUTTON_TEXT_PRESSED, $B052L5);  // temp $B052L4P
-       ADD_COLOR_CONFIG(BUTTON_TEXT_HIGHLIGHTED, $B052L5); // temp $B052L4P
+       ADD_COLOR_CONFIG(BUTTON_TEXT_DISABLED, $B052L4D);
+       ADD_COLOR_CONFIG(BUTTON_TEXT_PRESSED, $B052L5);
+       ADD_COLOR_CONFIG(BUTTON_TEXT_HIGHLIGHTED, $B052L5);
 
        ADD_COLOR_CONFIG(BUTTON_TRANSLUCENT_TEXT_NORMAL, $B052L8);
-       ADD_COLOR_CONFIG(BUTTON_TRANSLUCENT_TEXT_DISABLED, $B052L8);
+       ADD_COLOR_CONFIG(BUTTON_TRANSLUCENT_TEXT_DISABLED, $B052L8D);
        ADD_COLOR_CONFIG(BUTTON_TRANSLUCENT_TEXT_PRESSED, $B052L8P);
        ADD_COLOR_CONFIG(BUTTON_TRANSLUCENT_TEXT_HIGHLIGHTED, $B052L8P);
 
 
-       ADD_COLOR_CONFIG(SEGMENTED_ITEM_BG_NORMAL, $B0515L1); // $B0543 is 0x00000000, transparent
+       ADD_COLOR_CONFIG(SEGMENTED_ITEM_BG_NORMAL, $B0515L1);
        ADD_COLOR_CONFIG(SEGMENTED_ITEM_BG_DISABLED, $B0515L1);
        ADD_COLOR_CONFIG(SEGMENTED_ITEM_BG_PRESSED, $B0514P1);
        ADD_COLOR_CONFIG(SEGMENTED_ITEM_BG_HIGHLIGHTED, $B0514P1);
@@ -91,7 +92,7 @@ START_UI_CONFIG(FOOTER);
        ADD_COLOR_CONFIG(TAB_ITEM_TEXT_SELECTED, $B052L6P);
 
        ADD_COLOR_CONFIG(TAB_ITEM_TRANSLUCENT_TEXT_NORMAL, $B052L8);
-       ADD_COLOR_CONFIG(TAB_ITEM_TRANSLUCENT_TEXT_DISABLED, $B052L8);
+       ADD_COLOR_CONFIG(TAB_ITEM_TRANSLUCENT_TEXT_DISABLED, $B052L8D);
        ADD_COLOR_CONFIG(TAB_ITEM_TRANSLUCENT_TEXT_PRESSED, $B052L8P);
        ADD_COLOR_CONFIG(TAB_ITEM_TRANSLUCENT_TEXT_HIGHLIGHTED, $B052L8P);
        ADD_COLOR_CONFIG(TAB_ITEM_TRANSLUCENT_TEXT_SELECTED, $B052L8P);
@@ -99,7 +100,7 @@ START_UI_CONFIG(FOOTER);
        ADD_COLOR_CONFIG(BUTTON_ITEM_BG_NORMAL, $W011);
        ADD_COLOR_CONFIG(BUTTON_ITEM_BG_DISABLED, $W011);
        ADD_COLOR_CONFIG(BUTTON_ITEM_BG_PRESSED, $B042);
-       ADD_COLOR_CONFIG(BUTTON_ITEM_BG_HIGHLIGHTED, $B042);
+       ADD_COLOR_CONFIG(BUTTON_ITEM_BG_HIGHLIGHTED, $W161);
 
        ADD_COLOR_CONFIG(BUTTON_ITEM_TRANSLUCENT_BG_NORMAL, $B013);
        ADD_COLOR_CONFIG(BUTTON_ITEM_TRANSLUCENT_BG_DISABLED, $B013);
@@ -129,9 +130,9 @@ START_UI_CONFIG(FOOTER);
        ADD_COLOR_CONFIG(SOFTKEY_BG_HIGHLIGHTED, $B0520P);
 
        ADD_COLOR_CONFIG(SOFTKEY_TEXT_NORMAL, $F031L3);
-       ADD_COLOR_CONFIG(SOFTKEY_TEXT_DISABLED, $F031L3D);
-       ADD_COLOR_CONFIG(SOFTKEY_TEXT_PRESSED, $F031L3P);
-       ADD_COLOR_CONFIG(SOFTKEY_TEXT_HIGHLIGHTED, $F031L3P);
+       ADD_COLOR_CONFIG(SOFTKEY_TEXT_DISABLED, $F031L3);
+       ADD_COLOR_CONFIG(SOFTKEY_TEXT_PRESSED, $F031L1P);
+       ADD_COLOR_CONFIG(SOFTKEY_TEXT_HIGHLIGHTED, $F031L1P);
 
        ADD_COLOR_CONFIG(SOFTKEY_ICON_NORMAL, $B052L8);
        ADD_COLOR_CONFIG(SOFTKEY_ICON_DISABLED, $B052L8);

diff --git a/src/ui/resource/FUi_ResourceHeaderConfig.cpp b/src/ui/resource/FUi_ResourceHeaderConfig.cpp
index 70cc8f6..d646e23 100644 (file)
--- a/src/ui/resource/FUi_ResourceHeaderConfig.cpp
+++ b/src/ui/resource/FUi_ResourceHeaderConfig.cpp
@@ -33,27 +33,27 @@ START_UI_CONFIG(HEADER);
        ADD_COLOR_CONFIG(DESCRIPTION_TEXT_NORMAL, $B052L5);
        ADD_COLOR_CONFIG(TRANSLUCENT_DESCRIPTION_TEXT_NORMAL, $B052L8);
 
+       // $B0543 is 0x00000000, transparent
        ADD_COLOR_CONFIG(BUTTON_BG_NORMAL, $B0543);
        ADD_COLOR_CONFIG(BUTTON_BG_DISABLED, $B0543);
        ADD_COLOR_CONFIG(BUTTON_BG_PRESSED, $B0543);
        ADD_COLOR_CONFIG(BUTTON_BG_HIGHLIGHTED, $B0543);
 
-       ADD_COLOR_CONFIG(BUTTON_TRANSLUCENT_BG_NORMAL, $B013);
-       ADD_COLOR_CONFIG(BUTTON_TRANSLUCENT_BG_DISABLED, $B013);
-       ADD_COLOR_CONFIG(BUTTON_TRANSLUCENT_BG_PRESSED, $B013);
-       ADD_COLOR_CONFIG(BUTTON_TRANSLUCENT_BG_HIGHLIGHTED, $B013);
+       ADD_COLOR_CONFIG(BUTTON_TRANSLUCENT_BG_NORMAL, $B0543);
+       ADD_COLOR_CONFIG(BUTTON_TRANSLUCENT_BG_DISABLED, $B0543);
+       ADD_COLOR_CONFIG(BUTTON_TRANSLUCENT_BG_PRESSED, $B0543);
+       ADD_COLOR_CONFIG(BUTTON_TRANSLUCENT_BG_HIGHLIGHTED, $B0543);
 
        ADD_COLOR_CONFIG(BUTTON_TEXT_NORMAL, $B052L4);
-       ADD_COLOR_CONFIG(BUTTON_TEXT_DISABLED, $B052L4D); // temp $B052L4
-       ADD_COLOR_CONFIG(BUTTON_TEXT_PRESSED, $B052L5); // temp $B052L4P
-       ADD_COLOR_CONFIG(BUTTON_TEXT_HIGHLIGHTED, $B052L5);// temp $B052L4P
+       ADD_COLOR_CONFIG(BUTTON_TEXT_DISABLED, $B052L4D);
+       ADD_COLOR_CONFIG(BUTTON_TEXT_PRESSED, $B052L5);
+       ADD_COLOR_CONFIG(BUTTON_TEXT_HIGHLIGHTED, $B052L5);
 
        ADD_COLOR_CONFIG(BUTTON_TRANSLUCENT_TEXT_NORMAL, $B052L8);
-       ADD_COLOR_CONFIG(BUTTON_TRANSLUCENT_TEXT_DISABLED, $B052L8);
+       ADD_COLOR_CONFIG(BUTTON_TRANSLUCENT_TEXT_DISABLED, $B052L8D);
        ADD_COLOR_CONFIG(BUTTON_TRANSLUCENT_TEXT_PRESSED, $B052L8P);
        ADD_COLOR_CONFIG(BUTTON_TRANSLUCENT_TEXT_HIGHLIGHTED, $B052L8P);
 
-       // $B0543 is 0x00000000, transparent
        ADD_COLOR_CONFIG(SEGMENTED_ITEM_BG_NORMAL, $B0513);
        ADD_COLOR_CONFIG(SEGMENTED_ITEM_BG_DISABLED, $B0513);
        ADD_COLOR_CONFIG(SEGMENTED_ITEM_BG_PRESSED, $B0514P1);
@@ -73,7 +73,7 @@ START_UI_CONFIG(HEADER);
        ADD_COLOR_CONFIG(SEGMENTED_ITEM_TEXT_SELECTED, $B052L6P);
 
        ADD_COLOR_CONFIG(SEGMENTED_ITEM_TRANSLUCENT_TEXT_NORMAL, $B052L8);
-       ADD_COLOR_CONFIG(SEGMENTED_ITEM_TRANSLUCENT_TEXT_DISABLED, $B052L8);
+       ADD_COLOR_CONFIG(SEGMENTED_ITEM_TRANSLUCENT_TEXT_DISABLED, $B052L8D);
        ADD_COLOR_CONFIG(SEGMENTED_ITEM_TRANSLUCENT_TEXT_PRESSED, $B052L8P);
        ADD_COLOR_CONFIG(SEGMENTED_ITEM_TRANSLUCENT_TEXT_HIGHLIGHTED, $B052L8P);
        ADD_COLOR_CONFIG(SEGMENTED_ITEM_TRANSLUCENT_TEXT_SELECTED, $B052L8P);
@@ -97,7 +97,7 @@ START_UI_CONFIG(HEADER);
        ADD_COLOR_CONFIG(TAB_ITEM_TEXT_SELECTED, $B052L6P);
 
        ADD_COLOR_CONFIG(TAB_ITEM_TRANSLUCENT_TEXT_NORMAL, $B052L8);
-       ADD_COLOR_CONFIG(TAB_ITEM_TRANSLUCENT_TEXT_DISABLED, $B052L8);
+       ADD_COLOR_CONFIG(TAB_ITEM_TRANSLUCENT_TEXT_DISABLED, $B052L8D);
        ADD_COLOR_CONFIG(TAB_ITEM_TRANSLUCENT_TEXT_PRESSED, $B052L8P);
        ADD_COLOR_CONFIG(TAB_ITEM_TRANSLUCENT_TEXT_HIGHLIGHTED, $B052L8P);
        ADD_COLOR_CONFIG(TAB_ITEM_TRANSLUCENT_TEXT_SELECTED, $B052L8P);
@@ -105,7 +105,7 @@ START_UI_CONFIG(HEADER);
        ADD_COLOR_CONFIG(BUTTON_ITEM_BG_NORMAL, $W011);
        ADD_COLOR_CONFIG(BUTTON_ITEM_BG_DISABLED, $W011);
        ADD_COLOR_CONFIG(BUTTON_ITEM_BG_PRESSED, $B042);
-       ADD_COLOR_CONFIG(BUTTON_ITEM_BG_HIGHLIGHTED, $B042);
+       ADD_COLOR_CONFIG(BUTTON_ITEM_BG_HIGHLIGHTED, $W161);
 
        ADD_COLOR_CONFIG(BUTTON_ITEM_TRANSLUCENT_BG_NORMAL, $B013);
        ADD_COLOR_CONFIG(BUTTON_ITEM_TRANSLUCENT_BG_DISABLED, $B013);