commit 653292647aff82b8d04efb005901ea21adecf94e
author ichihlu <ichihlu@google.com> Thu Apr 01 13:24:02 2021 +0800
committer I-Chih Lu <ichihlu@google.com> Tue Apr 06 11:05:37 2021 +0000
tree c74d4ccbda6bd27777da78318c32cb56bc01db39
parent 0429cc75080080e566f4e3576e07efc7b69d9b9d

Update for new UX configuration

Bug: 184618911
Test: TUI CTS/VTS pass
Change-Id: Ia3bdbd912201497ed95fa863a4d129cb0d2a03fd

src/trusty_confirmation_ui.cpp

diff --git a/src/trusty_confirmation_ui.cpp b/src/trusty_confirmation_ui.cpp
index d74c8a5..5dd494e 100644
--- a/src/trusty_confirmation_ui.cpp
+++ b/src/trusty_confirmation_ui.cpp
@@ -32,18 +32,18 @@
 
 using teeui::ResponseCode;
 
-static constexpr const teeui::Color kColorEnabled = 0xff212121;
+static constexpr const teeui::Color kColorEnabled = 0xff242120;
 static constexpr const teeui::Color kColorDisabled = 0xffbdbdbd;
 static constexpr const teeui::Color kColorEnabledInv = 0xffdedede;
 static constexpr const teeui::Color kColorDisabledInv = 0xff424242;
 static constexpr const teeui::Color kColorBackground = 0xffffffff;
 static constexpr const teeui::Color kColorBackgroundInv = 0xff000000;
-static constexpr const teeui::Color kColorShieldInv = 0xfffac2a1;
-static constexpr const teeui::Color kColorShield = 0xff778500;
-static constexpr const teeui::Color kColorHintInv = 0xffffffff;
-static constexpr const teeui::Color kColorHint = 0xff757575;
-static constexpr const teeui::Color kColorButton = 0xffffffff;
-static constexpr const teeui::Color kColorButtonBackground = 0xff000000;
+static constexpr const teeui::Color kColorShieldInv = 0xfff69d66;
+static constexpr const teeui::Color kColorShield = 0xffe8731a;
+static constexpr const teeui::Color kColorHintInv = 0xffa6a09a;
+static constexpr const teeui::Color kColorHint = 0xff68635f;
+static constexpr const teeui::Color kColorButton = 0xffe8731a;
+static constexpr const teeui::Color kColorButtonInv = 0xfff69d66;
 
 template <typename Label, typename Layout>
 static teeui::Error updateString(Layout* layout) {
@@ -65,17 +65,17 @@
     using namespace teeui;
     if (inverted) {
         ctx->template setParam<ShieldColor>(kColorShieldInv);
-        ctx->template setParam<ColorText>(kColorEnabledInv);
+        ctx->template setParam<ColorText>(kColorBackground);
         ctx->template setParam<ColorBG>(kColorBackgroundInv);
-        ctx->template setParam<ColorButton>(kColorButton);
-        ctx->template setParam<ColorButtonBG>(kColorButtonBackground);
+        ctx->template setParam<ColorButton>(kColorButtonInv);
+        ctx->template setParam<ColorButtonBG>(kColorEnabled);
         ctx->template setParam<ColorTextHint>(kColorHintInv);
     } else {
         ctx->template setParam<ShieldColor>(kColorShield);
         ctx->template setParam<ColorText>(kColorEnabled);
         ctx->template setParam<ColorBG>(kColorBackground);
-        ctx->template setParam<ColorButton>(kColorButtonBackground);
-        ctx->template setParam<ColorButtonBG>(kColorButton);
+        ctx->template setParam<ColorButton>(kColorButton);
+        ctx->template setParam<ColorButtonBG>(kColorBackground);
         ctx->template setParam<ColorTextHint>(kColorHint);
     }
     return;