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

Merge "Apply new color scheme" into sc-dev am: 8b9365d4ad

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/13895558

Change-Id: Ib3310c1fe1dc5f1ea2aaa0994714bdd236998b1d
This commit is contained in:
Lucas Dupin
2021-03-22 19:18:13 +00:00
committed by Automerger Merge Worker
parent 2daad1f150 8b9365d4ad
commit 56a044ee30
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
res/values-v31/colors.xml
+11 -11
View File
@@ -17,17 +17,17 @@
*/
-->
<resources>
<color name="popup_color_primary_light">@android:color/system_primary_50</color>
<color name="popup_color_secondary_light">@android:color/system_primary_100</color>
<color name="popup_color_tertiary_light">@android:color/system_primary_300</color>
<color name="popup_color_primary_dark">@android:color/system_primary_800</color>
<color name="popup_color_secondary_dark">@android:color/system_primary_900</color>
<color name="popup_color_tertiary_dark">@android:color/system_primary_700</color>
<color name="popup_color_primary_light">@android:color/system_neutral1_50</color>
<color name="popup_color_secondary_light">@android:color/system_neutral2_100</color>
<color name="popup_color_tertiary_light">@android:color/system_neutral2_300</color>
<color name="popup_color_primary_dark">@android:color/system_neutral1_800</color>
<color name="popup_color_secondary_dark">@android:color/system_neutral1_900</color>
<color name="popup_color_tertiary_dark">@android:color/system_neutral2_700</color>
<color name="workspace_text_color_light">@android:color/system_primary_50</color>
<color name="workspace_text_color_dark">@android:color/system_primary_900</color>
<color name="workspace_text_color_light">@android:color/system_neutral1_50</color>
<color name="workspace_text_color_dark">@android:color/system_neutral1_900</color>
<color name="text_color_primary_dark">@android:color/system_primary_50</color>
<color name="text_color_secondary_dark">@android:color/system_primary_200</color>
<color name="text_color_tertiary_dark">@android:color/system_primary_400</color>
<color name="text_color_primary_dark">@android:color/system_neutral1_50</color>
<color name="text_color_secondary_dark">@android:color/system_neutral2_200</color>
<color name="text_color_tertiary_dark">@android:color/system_neutral2_400</color>
</resources>
tests/res/layout/test_layout_appwidget_dynamic_colors.xml
+3 -3
View File
@@ -18,7 +18,7 @@
<ImageView
android:layout_width="24dp"
android:layout_height="24dp"
android:background="@android:color/system_primary_500"/>
android:background="@android:color/system_neutral1_500"/>
</LinearLayout>
<LinearLayout
android:orientation = "horizontal"
@@ -32,7 +32,7 @@
<ImageView
android:layout_width="24dp"
android:layout_height="24dp"
android:background="@android:color/system_secondary_500"/>
android:background="@android:color/system_accent1_500"/>
</LinearLayout>
<LinearLayout
android:orientation = "horizontal"
@@ -46,7 +46,7 @@
<ImageView
android:layout_width="24dp"
android:layout_height="24dp"
android:background="@android:color/system_neutral_500"/>
android:background="@android:color/system_neutral2_500"/>
</LinearLayout>
</LinearLayout>