Skip to content

Commit 4ca0b54

Browse files
Material Engcopybara-github
authored andcommitted
Updates libraries for latest Material dynamic colors.
PiperOrigin-RevId: 532094062
1 parent 804c95f commit 4ca0b54

File tree

7 files changed

+314
-77
lines changed

7 files changed

+314
-77
lines changed

cpp/dynamiccolor/dynamic_color_test.cc

Lines changed: 21 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -49,32 +49,38 @@ TEST(DynamicColorTest, One) {
4949
0xff241816);
5050
EXPECT_EQ((unsigned int)(MaterialDynamicColors::Surface().GetArgb(s)),
5151
0xfffff8f6);
52-
EXPECT_EQ((unsigned int)(MaterialDynamicColors::SurfaceDark().GetArgb(s)),
52+
EXPECT_EQ((unsigned int)(MaterialDynamicColors::SurfaceDim().GetArgb(s)),
5353
0xffecd5d1);
54-
EXPECT_EQ((unsigned int)(MaterialDynamicColors::SurfaceLight().GetArgb(s)),
54+
EXPECT_EQ((unsigned int)(MaterialDynamicColors::SurfaceBright().GetArgb(s)),
5555
0xfffff8f6);
56-
EXPECT_EQ((unsigned int)(MaterialDynamicColors::SurfaceSub2().GetArgb(s)),
57-
0xffffffff);
58-
EXPECT_EQ((unsigned int)(MaterialDynamicColors::SurfaceSub1().GetArgb(s)),
59-
0xfffff0ee);
56+
EXPECT_EQ(
57+
(unsigned int)(MaterialDynamicColors::SurfaceContainerLowest().GetArgb(
58+
s)),
59+
0xffffffff);
60+
EXPECT_EQ(
61+
(unsigned int)(MaterialDynamicColors::SurfaceContainerLow().GetArgb(s)),
62+
0xfffff0ee);
6063
EXPECT_EQ(
6164
(unsigned int)(MaterialDynamicColors::SurfaceContainer().GetArgb(s)),
6265
0xffffe9e6);
63-
EXPECT_EQ((unsigned int)(MaterialDynamicColors::SurfaceAdd1().GetArgb(s)),
64-
0xfffbe3df);
65-
EXPECT_EQ((unsigned int)(MaterialDynamicColors::SurfaceAdd2().GetArgb(s)),
66-
0xfff5ddda);
66+
EXPECT_EQ(
67+
(unsigned int)(MaterialDynamicColors::SurfaceContainerHigh().GetArgb(s)),
68+
0xfffbe3df);
69+
EXPECT_EQ(
70+
(unsigned int)(MaterialDynamicColors::SurfaceContainerHighest().GetArgb(
71+
s)),
72+
0xfff5ddda);
6773
EXPECT_EQ((unsigned int)(MaterialDynamicColors::OnSurface().GetArgb(s)),
6874
0xff241816);
6975
EXPECT_EQ((unsigned int)(MaterialDynamicColors::SurfaceVariant().GetArgb(s)),
7076
0xfffddbd5);
7177
EXPECT_EQ(
7278
(unsigned int)(MaterialDynamicColors::OnSurfaceVariant().GetArgb(s)),
7379
0xff58413d);
74-
EXPECT_EQ((unsigned int)(MaterialDynamicColors::SurfaceInverse().GetArgb(s)),
75-
0xff534341);
80+
EXPECT_EQ((unsigned int)(MaterialDynamicColors::InverseSurface().GetArgb(s)),
81+
0xff3b2d2b);
7682
EXPECT_EQ(
77-
(unsigned int)(MaterialDynamicColors::OnSurfaceInverse().GetArgb(s)),
83+
(unsigned int)(MaterialDynamicColors::InverseOnSurface().GetArgb(s)),
7884
0xffffedeb);
7985
EXPECT_EQ((unsigned int)(MaterialDynamicColors::Outline().GetArgb(s)),
8086
0xff6f5652);
@@ -96,11 +102,8 @@ TEST(DynamicColorTest, One) {
96102
EXPECT_EQ(
97103
(unsigned int)(MaterialDynamicColors::OnPrimaryContainer().GetArgb(s)),
98104
0xffffffff);
99-
EXPECT_EQ((unsigned int)(MaterialDynamicColors::PrimaryInverse().GetArgb(s)),
100-
0xffffc6bd);
101-
EXPECT_EQ(
102-
(unsigned int)(MaterialDynamicColors::OnPrimaryInverse().GetArgb(s)),
103-
0xff7d0100);
105+
EXPECT_EQ((unsigned int)(MaterialDynamicColors::InversePrimary().GetArgb(s)),
106+
0xffffb5a9);
104107
EXPECT_EQ((unsigned int)(MaterialDynamicColors::Secondary().GetArgb(s)),
105108
0xff5c3521);
106109
EXPECT_EQ((unsigned int)(MaterialDynamicColors::OnSecondary().GetArgb(s)),

0 commit comments

Comments
 (0)