PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fixing color mismatch for Launcher3/NexusLauncher" into udc-dev

Browse Source
This commit is contained in:
Marcelo Arteiro
2023-06-13 11:59:42 +00:00
committed by Android (Google) Code Review
parent f5bec7dd30 ecff4b59c0
commit d469ce2460
28 changed files with 655 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
res/color-night-v31/material_color_surface.xml Normal file
View File

@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2022 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@android:color/system_neutral1_500" android:lStar="6" />
</selector>

19
res/color-night-v31/material_color_surface_bright.xml Normal file
View File

@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2022 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@android:color/system_neutral1_500" android:lStar="24" />
</selector>

19
res/color-night-v31/material_color_surface_container.xml Normal file
View File

@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2022 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@android:color/system_neutral1_500" android:lStar="12" />
</selector>

19
res/color-night-v31/material_color_surface_container_high.xml Normal file
View File

@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2022 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@android:color/system_neutral1_500" android:lStar="12" />
</selector>

19
res/color-night-v31/material_color_surface_container_highest.xml Normal file
View File

@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2022 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@android:color/system_neutral1_500" android:lStar="12" />
</selector>

19
res/color-night-v31/material_color_surface_container_low.xml Normal file
View File

@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2022 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@android:color/system_neutral1_500" android:lStar="12" />
</selector>

19
res/color-night-v31/material_color_surface_container_lowest.xml Normal file
View File

@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2022 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@android:color/system_neutral1_500" android:lStar="12" />
</selector>

19
res/color-night-v31/material_color_surface_dim.xml Normal file
View File

@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2022 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@android:color/system_neutral1_500" android:lStar="6" />
</selector>

19
res/color-night-v31/material_color_surface_inverse.xml Normal file
View File

@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2022 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@android:color/system_neutral1_500" android:lStar="98" />
</selector>

19
res/color-night-v31/material_color_surface_variant.xml Normal file
View File

@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2022 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@android:color/system_neutral1_500" android:lStar="6" />
</selector>

23
res/color-night-v31/surface.xml
View File

@@ -1,23 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/*
**
** Copyright 2021, The Android Open Source Project
**
** Licensed under the Apache License, Version 2.0 (the "License");
** you may not use this file except in compliance with the License.
** You may obtain a copy of the License at
**
** http://www.apache.org/licenses/LICENSE-2.0
**
** Unless required by applicable law or agreed to in writing, software
** distributed under the License is distributed on an "AS IS" BASIS,
** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
** See the License for the specific language governing permissions and
** limitations under the License.
*/
-->
<selector
xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@android:color/system_neutral1_800" />
</selector>

19
res/color-v31/material_color_surface.xml Normal file
View File

@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2023 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@android:color/system_neutral1_500" android:lStar="98" />
</selector>

19
res/color-v31/material_color_surface_bright.xml Normal file
View File

@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2023 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@android:color/system_neutral1_500" android:lStar="98" />
</selector>

19
res/color-v31/material_color_surface_container.xml Normal file
View File

@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2023 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@android:color/system_neutral1_500" android:lStar="94" />
</selector>

19
res/color-v31/material_color_surface_container_high.xml Normal file
View File

@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2023 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@android:color/system_neutral1_500" android:lStar="94" />
</selector>

19
res/color-v31/material_color_surface_container_highest.xml Normal file
View File

@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2023 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@android:color/system_neutral1_500" android:lStar="94" />
</selector>

19
res/color-v31/material_color_surface_container_low.xml Normal file
View File

@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2023 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@android:color/system_neutral1_500" android:lStar="94" />
</selector>

19
res/color-v31/material_color_surface_container_lowest.xml Normal file
View File

@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2022 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@android:color/system_neutral1_500" android:lStar="94" />
</selector>

19
res/color-v31/material_color_surface_dim.xml Normal file
View File

@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2022 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@android:color/system_neutral1_500" android:lStar="87" />
</selector>

20
res/color-v31/material_color_surface_inverse.xml Normal file
View File

@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2023 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@android:color/system_neutral1_500" android:lStar="6" />
</selector>

19
res/color-v31/material_color_surface_variant.xml Normal file
View File

@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2022 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@android:color/system_neutral1_500" android:lStar="87" />
</selector>

3
res/color-v31/surface.xml
View File

@@ -19,5 +19,6 @@
-->
<selector
xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@android:color/system_neutral1_500" android:lStar="98"/>
<item android:color="?attr/materialColorSurfaceContainerHighest"/>
</selector>

35
res/values-night-v31/colors.xml
View File

@@ -51,4 +51,39 @@
@android:color/system_accent1_200</color>
<color name="work_fab_icon_color">
@android:color/system_accent1_900</color>
<color name="material_color_on_secondary_fixed_variant">@android:color/system_accent2_700</color>
<color name="material_color_on_tertiary_fixed_variant">@android:color/system_accent3_700</color>
<color name="material_color_on_primary_fixed_variant">@android:color/system_accent1_700</color>
<color name="material_color_on_secondary_container">@android:color/system_accent2_100</color>
<color name="material_color_on_tertiary_container">@android:color/system_accent3_100</color>
<color name="material_color_on_primary_container">@android:color/system_accent1_100</color>
<color name="material_color_secondary_fixed_dim">@android:color/system_accent2_200</color>
<color name="material_color_on_error_container">#FFDAD5</color>
<color name="material_color_on_secondary_fixed">@android:color/system_accent2_900</color>
<color name="material_color_on_surface_inverse">@android:color/system_neutral1_900</color>
<color name="material_color_tertiary_fixed_dim">@android:color/system_accent3_200</color>
<color name="material_color_on_tertiary_fixed">@android:color/system_accent3_900</color>
<color name="material_color_primary_fixed_dim">@android:color/system_accent1_200</color>
<color name="material_color_secondary_container">@android:color/system_accent2_700</color>
<color name="material_color_error_container">#930001</color>
<color name="material_color_on_primary_fixed">@android:color/system_accent1_900</color>
<color name="material_color_primary_inverse">@android:color/system_accent1_600</color>
<color name="material_color_secondary_fixed">@android:color/system_accent2_100</color>
<color name="material_color_tertiary_container">@android:color/system_accent3_700</color>
<color name="material_color_tertiary_fixed">@android:color/system_accent3_100</color>
<color name="material_color_primary_container">@android:color/system_accent1_700</color>
<color name="material_color_on_background">@android:color/system_neutral1_800</color>
<color name="material_color_primary_fixed">@android:color/system_accent1_100</color>
<color name="material_color_on_secondary">@android:color/system_accent2_800</color>
<color name="material_color_on_tertiary">@android:color/system_accent3_800</color>
<color name="material_color_on_error">#690001</color>
<color name="material_color_on_surface_variant">@android:color/system_neutral2_200</color>
<color name="material_color_outline">@android:color/system_neutral2_400</color>
<color name="material_color_outline_variant">@android:color/system_neutral2_700</color>
<color name="material_color_on_primary">@android:color/system_accent1_800</color>
<color name="material_color_on_surface">@android:color/system_neutral1_100</color>
<color name="material_color_primary">@android:color/system_accent1_200</color>
<color name="material_color_secondary">@android:color/system_accent2_200</color>
<color name="material_color_tertiary">@android:color/system_accent3_200</color>
</resources>

64
res/values-night/colors.xml Normal file
View File

@@ -0,0 +1,64 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
**
** Copyright 2023, The Android Open Source Project
**
** Licensed under the Apache License, Version 2.0 (the "License");
** you may not use this file except in compliance with the License.
** You may obtain a copy of the License at
**
** http://www.apache.org/licenses/LICENSE-2.0
**
** Unless required by applicable law or agreed to in writing, software
** distributed under the License is distributed on an "AS IS" BASIS,
** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
** See the License for the specific language governing permissions and
** limitations under the License.
*/
-->
<resources>
<color name="material_color_on_secondary_fixed_variant">#3F4759</color>
<color name="material_color_on_tertiary_fixed_variant">#583E5B</color>
<color name="material_color_surface_container_lowest">#0D0E11</color>
<color name="material_color_on_primary_fixed_variant">#2B4678</color>
<color name="material_color_on_secondary_container">#DBE2F9</color>
<color name="material_color_on_tertiary_container">#FBD7FC</color>
<color name="material_color_surface_container_low">#1B1B1F</color>
<color name="material_color_on_primary_container">#D8E2FF</color>
<color name="material_color_secondary_fixed_dim">#BFC6DC</color>
<color name="material_color_on_error_container">#FFDAD5</color>
<color name="material_color_on_secondary_fixed">#141B2C</color>
<color name="material_color_on_surface_inverse">#1B1B1F</color>
<color name="material_color_tertiary_fixed_dim">#DEBCDF</color>
<color name="material_color_on_tertiary_fixed">#29132D</color>
<color name="material_color_primary_fixed_dim">#ADC6FF</color>
<color name="material_color_secondary_container">#3F4759</color>
<color name="material_color_error_container">#930001</color>
<color name="material_color_on_primary_fixed">#001A41</color>
<color name="material_color_primary_inverse">#445E91</color>
<color name="material_color_secondary_fixed">#DBE2F9</color>
<color name="material_color_surface_inverse">#FAF9FD</color>
<color name="material_color_surface_variant">#44474F</color>
<color name="material_color_tertiary_container">#583E5B</color>
<color name="material_color_tertiary_fixed">#FBD7FC</color>
<color name="material_color_primary_container">#2B4678</color>
<color name="material_color_on_background">#E3E2E6</color>
<color name="material_color_primary_fixed">#D8E2FF</color>
<color name="material_color_on_secondary">#293041</color>
<color name="material_color_on_tertiary">#402843</color>
<color name="material_color_surface_dim">#121316</color>
<color name="material_color_surface_bright">#38393C</color>
<color name="material_color_on_error">#690001</color>
<color name="material_color_surface">#121316</color>
<color name="material_color_surface_container_high">#292A2D</color>
<color name="material_color_surface_container_highest">#343538</color>
<color name="material_color_on_surface_variant">#C4C6D0</color>
<color name="material_color_outline">#72747D</color>
<color name="material_color_outline_variant">#444746</color>
<color name="material_color_on_primary">#102F60</color>
<color name="material_color_on_surface">#E3E2E6</color>
<color name="material_color_surface_container">#1F1F23</color>
<color name="material_color_primary">#ADC6FF</color>
<color name="material_color_secondary">#BFC6DC</color>
<color name="material_color_tertiary">#DEBCDF</color>
</resources>

36
res/values-v31/colors.xml
View File

@@ -102,4 +102,40 @@
@android:color/system_accent1_200</color>
<color name="work_fab_icon_color">
@android:color/system_accent1_900</color>
<color name="material_color_on_secondary_fixed_variant">@android:color/system_accent2_700</color>
<color name="material_color_on_tertiary_fixed_variant">@android:color/system_accent3_700</color>
<color name="material_color_on_primary_fixed_variant">@android:color/system_accent1_700</color>
<color name="material_color_on_secondary_container">@android:color/system_accent2_900</color>
<color name="material_color_on_tertiary_container">@android:color/system_accent3_900</color>
<color name="material_color_on_primary_container">@android:color/system_accent1_900</color>
<color name="material_color_secondary_fixed_dim">@android:color/system_accent2_200</color>
<color name="material_color_on_error_container">#410000</color>
<color name="material_color_on_secondary_fixed">@android:color/system_accent2_900</color>
<color name="material_color_on_surface_inverse">@android:color/system_neutral1_100</color>
<color name="material_color_tertiary_fixed_dim">@android:color/system_accent3_200</color>
<color name="material_color_on_tertiary_fixed">@android:color/system_accent3_900</color>
<color name="material_color_primary_fixed_dim">@android:color/system_accent1_200</color>
<color name="material_color_secondary_container">@android:color/system_accent2_100</color>
<color name="material_color_error_container">#FFDAD5</color>
<color name="material_color_on_primary_fixed">@android:color/system_accent1_900</color>
<color name="material_color_primary_inverse">@android:color/system_accent1_200</color>
<color name="material_color_secondary_fixed">@android:color/system_accent2_100</color>
<color name="material_color_tertiary_container">@android:color/system_accent3_100</color>
<color name="material_color_tertiary_fixed">@android:color/system_accent3_100</color>
<color name="material_color_primary_container">@android:color/system_accent1_100</color>
<color name="material_color_on_background">@android:color/system_neutral1_50</color>
<color name="material_color_primary_fixed">@android:color/system_accent1_100</color>
<color name="material_color_on_secondary">@android:color/system_accent2_0</color>
<color name="material_color_on_tertiary">@android:color/system_accent3_0</color>
<color name="material_color_on_error">#FFFFFF</color>
<color name="material_color_on_surface_variant">@android:color/system_neutral2_700</color>
<color name="material_color_outline">@android:color/system_neutral2_500</color>
<color name="material_color_outline_variant">@android:color/system_neutral2_200</color>
<color name="material_color_on_primary">@android:color/system_accent1_0</color>
<color name="material_color_on_surface">@android:color/system_neutral1_900</color>
<color name="material_color_primary">@android:color/system_accent1_600</color>
<color name="material_color_secondary">@android:color/system_accent2_600</color>
<color name="material_color_tertiary">@android:color/system_accent3_600</color>
</resources>

45
res/values/attrs.xml
View File

@@ -506,6 +506,51 @@
<attr name="appIconSize" format="dimension" />
</declare-styleable>
<attr name="materialColorOnSecondaryFixedVariant" format="color" />
<attr name="materialColorOnTertiaryFixedVariant" format="color" />
<attr name="materialColorSurfaceContainerLowest" format="color" />
<attr name="materialColorOnPrimaryFixedVariant" format="color" />
<attr name="materialColorOnSecondaryContainer" format="color" />
<attr name="materialColorOnTertiaryContainer" format="color" />
<attr name="materialColorSurfaceContainerLow" format="color" />
<attr name="materialColorOnPrimaryContainer" format="color" />
<attr name="materialColorSecondaryFixedDim" format="color" />
<attr name="materialColorOnErrorContainer" format="color" />
<attr name="materialColorOnSecondaryFixed" format="color" />
<attr name="materialColorOnSurfaceInverse" format="color" />
<attr name="materialColorTertiaryFixedDim" format="color" />
<attr name="materialColorOnTertiaryFixed" format="color" />
<attr name="materialColorPrimaryFixedDim" format="color" />
<attr name="materialColorSecondaryContainer" format="color" />
<attr name="materialColorErrorContainer" format="color" />
<attr name="materialColorOnPrimaryFixed" format="color" />
<attr name="materialColorPrimaryInverse" format="color" />
<attr name="materialColorSecondaryFixed" format="color" />
<attr name="materialColorTertiaryContainer" format="color" />
<attr name="materialColorTertiaryFixed" format="color" />
<attr name="materialColorPrimaryContainer" format="color" />
<attr name="materialColorOnBackground" format="color" />
<attr name="materialColorPrimaryFixed" format="color" />
<attr name="materialColorOnSecondary" format="color" />
<attr name="materialColorOnTertiary" format="color" />
<attr name="materialColorOnError" format="color" />
<attr name="materialColorOnSurfaceVariant" format="color" />
<attr name="materialColorOutline" format="color" />
<attr name="materialColorOutlineVariant" format="color" />
<attr name="materialColorOnPrimary" format="color" />
<attr name="materialColorOnSurface" format="color" />
<attr name="materialColorPrimary" format="color" />
<attr name="materialColorSecondary" format="color" />
<attr name="materialColorTertiary" format="color" />
<attr name="materialColorSurfaceInverse" format="color" />
<attr name="materialColorSurfaceVariant" format="color" />
<attr name="materialColorSurfaceDim" format="color" />
<attr name="materialColorSurfaceBright" format="color" />
<attr name="materialColorSurface" format="color" />
<attr name="materialColorSurfaceContainerHigh" format="color" />
<attr name="materialColorSurfaceContainerHighest" format="color" />
<attr name="materialColorSurfaceContainer" format="color" />
<declare-styleable name="WidgetSections">
<!-- Component name of an app widget provider. -->
<attr name="provider" format="string" />

45
res/values/colors.xml
View File

@@ -128,4 +128,49 @@
<color name="widget_picker_selected_tab_text_color_dark">#2D312F</color>
<color name="widget_picker_unselected_tab_text_color_dark">#C4C7C5</color>
<color name="widget_picker_collapse_handle_color_dark">#444746</color>
<color name="material_color_on_secondary_fixed_variant">#3F4759</color>
<color name="material_color_on_tertiary_fixed_variant">#583E5B</color>
<color name="material_color_surface_container_lowest">#FFFFFF</color>
<color name="material_color_on_primary_fixed_variant">#2B4678</color>
<color name="material_color_on_secondary_container">#141B2C</color>
<color name="material_color_on_tertiary_container">#29132D</color>
<color name="material_color_surface_container_low">#F5F3F7</color>
<color name="material_color_on_primary_container">#001A41</color>
<color name="material_color_secondary_fixed_dim">#BFC6DC</color>
<color name="material_color_on_error_container">#410000</color>
<color name="material_color_on_secondary_fixed">#141B2C</color>
<color name="material_color_on_surface_inverse">#E3E2E6</color>
<color name="material_color_tertiary_fixed_dim">#DEBCDF</color>
<color name="material_color_on_tertiary_fixed">#29132D</color>
<color name="material_color_primary_fixed_dim">#ADC6FF</color>
<color name="material_color_secondary_container">#DBE2F9</color>
<color name="material_color_error_container">#FFDAD5</color>
<color name="material_color_on_primary_fixed">#001A41</color>
<color name="material_color_primary_inverse">#ADC6FF</color>
<color name="material_color_secondary_fixed">#DBE2F9</color>
<color name="material_color_surface_inverse">#121316</color>
<color name="material_color_surface_variant">#E1E2EC</color>
<color name="material_color_tertiary_container">#FBD7FC</color>
<color name="material_color_tertiary_fixed">#FBD7FC</color>
<color name="material_color_primary_container">#D8E2FF</color>
<color name="material_color_on_background">#1B1B1F</color>
<color name="material_color_primary_fixed">#D8E2FF</color>
<color name="material_color_on_secondary">#FFFFFF</color>
<color name="material_color_on_tertiary">#FFFFFF</color>
<color name="material_color_surface_dim">#DBD9DD</color>
<color name="material_color_surface_bright">#FAF9FD</color>
<color name="material_color_on_error">#FFFFFF</color>
<color name="material_color_surface">#FAF9FD</color>
<color name="material_color_surface_container_high">#E9E7EC</color>
<color name="material_color_surface_container_highest">#E3E2E6</color>
<color name="material_color_on_surface_variant">#44474F</color>
<color name="material_color_outline">#72747D</color>
<color name="material_color_outline_variant">#C4C7C5</color>
<color name="material_color_on_primary">#FFFFFF</color>
<color name="material_color_on_surface">#1B1B1F</color>
<color name="material_color_surface_container">#EFEDF1</color>
<color name="material_color_primary">#445E91</color>
<color name="material_color_secondary">#575E71</color>
<color name="material_color_tertiary">#715573</color>
</resources>

49
res/values/styles.xml
View File

@@ -31,7 +31,7 @@
<style name="LauncherTheme" parent="@style/BaseLauncherTheme">
<item name="android:textColorSecondary">#DE000000</item>
<item name="allAppsScrimColor">?android:attr/colorBackgroundFloating</item>
<item name="allAppsScrimColor">?attr/materialColorSurfaceDim</item>
<item name="allappsHeaderProtectionColor">@color/popup_color_tertiary_light</item>
<item name="allAppsNavBarScrimColor">#66FFFFFF</item>
<item name="popupColorPrimary">@color/popup_color_primary_light</item>
@@ -75,6 +75,51 @@
<item name="android:statusBarColor">#00000000</item>
<item name="android:navigationBarColor">#00000000</item>
<item name="android:switchStyle">@style/SwitchStyle</item>
<item name="materialColorOnSecondaryFixedVariant">@color/material_color_on_secondary_fixed_variant</item>
<item name="materialColorOnTertiaryFixedVariant">@color/material_color_on_tertiary_fixed_variant</item>
<item name="materialColorSurfaceContainerLowest">@color/material_color_surface_container_lowest</item>
<item name="materialColorOnPrimaryFixedVariant">@color/material_color_on_primary_fixed_variant</item>
<item name="materialColorOnSecondaryContainer">@color/material_color_on_secondary_container</item>
<item name="materialColorOnTertiaryContainer">@color/material_color_on_tertiary_container</item>
<item name="materialColorSurfaceContainerLow">@color/material_color_surface_container_low</item>
<item name="materialColorOnPrimaryContainer">@color/material_color_on_primary_container</item>
<item name="materialColorSecondaryFixedDim">@color/material_color_secondary_fixed_dim</item>
<item name="materialColorOnErrorContainer">@color/material_color_on_error_container</item>
<item name="materialColorOnSecondaryFixed">@color/material_color_on_secondary_fixed</item>
<item name="materialColorOnSurfaceInverse">@color/material_color_on_surface_inverse</item>
<item name="materialColorTertiaryFixedDim">@color/material_color_tertiary_fixed_dim</item>
<item name="materialColorOnTertiaryFixed">@color/material_color_on_tertiary_fixed</item>
<item name="materialColorPrimaryFixedDim">@color/material_color_primary_fixed_dim</item>
<item name="materialColorSecondaryContainer">@color/material_color_secondary_container</item>
<item name="materialColorErrorContainer">@color/material_color_error_container</item>
<item name="materialColorOnPrimaryFixed">@color/material_color_on_primary_fixed</item>
<item name="materialColorPrimaryInverse">@color/material_color_primary_inverse</item>
<item name="materialColorSecondaryFixed">@color/material_color_secondary_fixed</item>
<item name="materialColorSurfaceInverse">@color/material_color_surface_inverse</item>
<item name="materialColorSurfaceVariant">@color/material_color_surface_variant</item>
<item name="materialColorTertiaryContainer">@color/material_color_tertiary_container</item>
<item name="materialColorTertiaryFixed">@color/material_color_tertiary_fixed</item>
<item name="materialColorPrimaryContainer">@color/material_color_primary_container</item>
<item name="materialColorOnBackground">@color/material_color_on_background</item>
<item name="materialColorPrimaryFixed">@color/material_color_primary_fixed</item>
<item name="materialColorOnSecondary">@color/material_color_on_secondary</item>
<item name="materialColorOnTertiary">@color/material_color_on_tertiary</item>
<item name="materialColorSurfaceDim">@color/material_color_surface_dim</item>
<item name="materialColorSurfaceBright">@color/material_color_surface_bright</item>
<item name="materialColorOnError">@color/material_color_on_error</item>
<item name="materialColorSurface">@color/material_color_surface</item>
<item name="materialColorSurfaceContainerHigh">@color/material_color_surface_container_high</item>
<item name="materialColorSurfaceContainerHighest">@color/material_color_surface_container_highest</item>
<item name="materialColorOnSurfaceVariant">@color/material_color_on_surface_variant</item>
<item name="materialColorOutline">@color/material_color_outline</item>
<item name="materialColorOutlineVariant">@color/material_color_outline_variant</item>
<item name="materialColorOnPrimary">@color/material_color_on_primary</item>
<item name="materialColorOnSurface">@color/material_color_on_surface</item>
<item name="materialColorSurfaceContainer">@color/material_color_surface_container</item>
<item name="materialColorPrimary">@color/material_color_primary</item>
<item name="materialColorSecondary">@color/material_color_secondary</item>
<item name="materialColorTertiary">@color/material_color_tertiary</item>
</style>
<style name="SwitchStyle"
@@ -105,7 +150,7 @@
<item name="android:textColorHint">#A0FFFFFF</item>
<item name="android:colorControlHighlight">#19FFFFFF</item>
<item name="android:colorPrimary">#FF212121</item>
<item name="allAppsScrimColor">?android:attr/colorBackgroundFloating</item>
<item name="allAppsScrimColor">?attr/materialColorSurfaceDim</item>
<item name="allAppsNavBarScrimColor">#80000000</item>
<item name="popupColorPrimary">@color/popup_color_primary_dark</item>
<item name="popupColorSecondary">@color/popup_color_secondary_dark</item>