Merge "Add DND icon as option in the icon picker" into main

This commit is contained in:
Treehugger Robot
2024-08-30 16:21:03 +00:00
committed by Android (Google) Code Review

View File

@@ -1536,6 +1536,7 @@
<item>@*android:drawable/ic_zen_mode_icon_group_of_people</item> <item>@*android:drawable/ic_zen_mode_icon_group_of_people</item>
<item>@*android:drawable/ic_zen_mode_icon_lightbulb</item> <item>@*android:drawable/ic_zen_mode_icon_lightbulb</item>
<item>@*android:drawable/ic_zen_mode_type_schedule_calendar</item> <item>@*android:drawable/ic_zen_mode_type_schedule_calendar</item>
<item>@*android:drawable/ic_zen_mode_type_special_dnd</item>
<!-- Sports --> <!-- Sports -->
<item>@*android:drawable/ic_zen_mode_icon_running</item> <item>@*android:drawable/ic_zen_mode_icon_running</item>
<item>@*android:drawable/ic_zen_mode_icon_golf</item> <item>@*android:drawable/ic_zen_mode_icon_golf</item>
@@ -1561,7 +1562,6 @@
<!-- Other activities --> <!-- Other activities -->
<item>@*android:drawable/ic_zen_mode_icon_train</item> <item>@*android:drawable/ic_zen_mode_icon_train</item>
<item>@*android:drawable/ic_zen_mode_type_driving</item> <!-- Car --> <item>@*android:drawable/ic_zen_mode_type_driving</item> <!-- Car -->
<item>@*android:drawable/ic_zen_mode_icon_croissant</item>
<item>@*android:drawable/ic_zen_mode_icon_fork_and_knife</item> <item>@*android:drawable/ic_zen_mode_icon_fork_and_knife</item>
<item>@*android:drawable/ic_zen_mode_icon_shopping_cart</item> <item>@*android:drawable/ic_zen_mode_icon_shopping_cart</item>
<item>@*android:drawable/ic_zen_mode_icon_child</item> <item>@*android:drawable/ic_zen_mode_icon_child</item>
@@ -1587,6 +1587,7 @@
<item>Group of people</item> <item>Group of people</item>
<item>Lightbulb</item> <item>Lightbulb</item>
<item>Calendar</item> <item>Calendar</item>
<item>Do Not Disturb</item>
<!-- Sports --> <!-- Sports -->
<item>Person running</item> <item>Person running</item>
<item>Golf</item> <item>Golf</item>
@@ -1612,7 +1613,6 @@
<!-- Other activities --> <!-- Other activities -->
<item>Train</item> <item>Train</item>
<item>Car</item> <item>Car</item>
<item>Croissant</item>
<item>Fork and knife</item> <item>Fork and knife</item>
<item>Shopping cart</item> <item>Shopping cart</item>
<item>Child</item> <item>Child</item>