Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e1dbcfcd authored by Matías Hernández's avatar Matías Hernández
Browse files

Update icon picker options, sort order, and descriptions 

Final icon list is ready!

Bug: 359171199
Test: atest IconOptionsProviderImplTest + manual
Flag: android.app.modes_ui
Change-Id: Ia46558fa320bbcc44d19fdda81b14773851a6060
parent db503683

res/values/arrays.xml

+80 −30
Original line number Diff line number Diff line
@@ -1527,54 +1527,104 @@ 
        <item>2</item>

    </string-array>



    <!-- TODO: b/333901673 - Get full icon list. -->

    <array name="zen_mode_icon_options" translatable="false">

        <item>@*android:drawable/ic_zen_mode_type_bedtime</item>

        <item>@*android:drawable/ic_zen_mode_type_driving</item>

        <item>@*android:drawable/ic_zen_mode_type_immersive</item>

        <!-- Work/Study/Meetings -->

        <item>@*android:drawable/ic_zen_mode_icon_work</item> <!-- Briefcase -->

        <item>@*android:drawable/ic_zen_mode_icon_classical_building</item>

        <item>@*android:drawable/ic_zen_mode_icon_apartment_building</item>

        <item>@*android:drawable/ic_zen_mode_icon_speech_bubble</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_type_schedule_calendar</item>

        <item>@*android:drawable/ic_zen_mode_type_schedule_time</item>

        <item>@*android:drawable/ic_zen_mode_icon_beach</item>

        <item>@*android:drawable/ic_zen_mode_icon_camping</item>

        <item>@*android:drawable/ic_zen_mode_type_theater</item>

        <item>@*android:drawable/ic_zen_mode_icon_gaming</item>

        <!-- Sports -->

        <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_gym</item>

        <item>@*android:drawable/ic_zen_mode_icon_ball_sports</item>

        <item>@*android:drawable/ic_zen_mode_icon_martial_arts</item>

        <item>@*android:drawable/ic_zen_mode_icon_swimming</item>

        <item>@*android:drawable/ic_zen_mode_icon_hiking</item>

        <item>@*android:drawable/ic_zen_mode_icon_golf</item>

        <item>@*android:drawable/ic_zen_mode_icon_ball_sports</item>

        <item>@*android:drawable/ic_zen_mode_icon_martial_arts</item>

        <!-- Leisure -->

        <item>@*android:drawable/ic_zen_mode_icon_gaming</item>

        <item>@*android:drawable/ic_zen_mode_icon_palette</item>

        <item>@*android:drawable/ic_zen_mode_icon_snowflake</item>

        <item>@*android:drawable/ic_zen_mode_icon_beach</item>

        <item>@*android:drawable/ic_zen_mode_icon_workshop</item>

        <item>@*android:drawable/ic_zen_mode_icon_work</item>

        <item>@*android:drawable/ic_zen_mode_type_other</item>

        <item>@*android:drawable/ic_zen_mode_type_unknown</item>

        <item>@*android:drawable/ic_zen_mode_type_managed</item>

        <item>@*android:drawable/ic_zen_mode_icon_camping</item>

        <item>@*android:drawable/ic_zen_mode_type_theater</item> <!-- Film reel -->

        <item>@*android:drawable/ic_zen_mode_icon_book</item>

        <!-- Wellbeing -->

        <item>@*android:drawable/ic_zen_mode_type_unknown</item> <!-- Lotus flower -->

        <item>@*android:drawable/ic_zen_mode_type_immersive</item>

        <item>@*android:drawable/ic_zen_mode_icon_headphones</item>

        <item>@*android:drawable/ic_zen_mode_icon_tv</item>

        <!-- Other activities -->

        <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_icon_croissant</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_child</item>

        <item>@*android:drawable/ic_zen_mode_icon_rabbit</item>

        <item>@*android:drawable/ic_zen_mode_icon_animal_paw</item>

        <!-- Generic / abstract -->

        <item>@*android:drawable/ic_zen_mode_type_managed</item> <!-- Account -->

        <item>@*android:drawable/ic_zen_mode_type_other</item> <!-- Star -->

        <item>@*android:drawable/ic_zen_mode_icon_heart</item>

        <item>@*android:drawable/ic_zen_mode_icon_house</item>

        <item>@*android:drawable/ic_zen_mode_type_bedtime</item> <!-- Moon -->

        <item>@*android:drawable/ic_zen_mode_type_schedule_time</item>

    </array>



    <!-- TODO: b/333901673 - Complete list -->

    <!-- Descriptions of the icons in zen_mode_icon_options. Should describe the associated image

         [CHAR LIMIT=NONE] -->

    <string-array name="zen_mode_icon_options_descriptions">

        <item>Half-moon</item>

        <item>Car</item>

        <item>Person\'s mind</item>

        <!-- Work/Study/Meetings -->

        <item>Briefcase</item>

        <item>Classical building</item>

        <item>Apartment building</item>

        <item>Speech bubble</item>

        <item>Group of people</item>

        <item>Lightbulb</item>

        <item>Calendar</item>

        <item>Clock</item>

        <item>Beach umbrella</item>

        <item>Tent</item>

        <item>Film reel</item>

        <item>Game controller</item>

        <!-- Sports -->

        <item>Person running</item>

        <item>Golf</item>

        <item>Gym dumbbell</item>

        <item>Person throwing ball</item>

        <item>Person kicking</item>

        <item>Swimming</item>

        <item>Person hiking</item>

        <item>Golf</item>

        <item>Person throwing ball</item>

        <item>Person kicking</item>

        <!-- Leisure -->

        <item>Game controller</item>

        <item>Artist color palette</item>

        <item>Snowflake</item>

        <item>Beach umbrella</item>

        <item>Workshop tools</item>

        <item>Briefcase</item>

        <item>Star</item>

        <item>Tent</item>

        <item>Film reel</item>

        <item>Book</item>

        <!-- Wellbeing -->

        <item>Lotus flower</item>

        <item>Person\'s mind</item>

        <item>Headphones</item>

        <item>TV</item>

        <!-- Other activities -->

        <item>Train</item>

        <item>Car</item>

        <item>Croissant</item>

        <item>Fork and knife</item>

        <item>Shopping cart</item>

        <item>Child</item>

        <item>Rabbit</item>

        <item>Animal paw</item>

        <!-- Generic / abstract -->

        <item>Supervisor</item>

        <item>Star</item>

        <item>Heart</item>

        <item>House</item>

        <item>Half-moon</item>

        <item>Clock</item>

    </string-array>



    <!-- Packages that will not show Display over other apps permission -->

tests/robotests/src/com/android/settings/notification/modes/IconOptionsProviderImplTest.java

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ import org.robolectric.RuntimeEnvironment; 
@RunWith(RobolectricTestRunner.class)

public class IconOptionsProviderImplTest {



    private static final int EXPECTED_NUMBER_OF_ICON_OPTIONS = 20;

    private static final int EXPECTED_NUMBER_OF_ICON_OPTIONS = 40;



    @Test

    public void iconResources_correctResources() {