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

Commit ff2d85a6 authored by Matías Hernández's avatar Matías Hernández Committed by Android (Google) Code Review
Browse files

Merge "Add new icons to the Modes icon picker" into main

parents 790fad6d 0b7a2221

res/values/arrays.xml

+27 −5
Original line number Diff line number Diff line
@@ -1530,12 +1530,23 @@ 
        <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>

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

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

        <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_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>

    </array>



    <!-- TODO: b/333901673 - Complete list -->
@@ -1545,12 +1556,23 @@ 
        <item>Bedtime</item>

        <item>Driving</item>

        <item>Immersive</item>

        <item>Managed</item>

        <item>Star</item>

        <item>Calendar</item>

        <item>Time</item>

        <item>Beach</item>

        <item>Camping</item>

        <item>Theater</item>

        <item>Flower</item>

        <item>Gaming</item>

        <item>Gym</item>

        <item>Ball sports</item>

        <item>Martial arts</item>

        <item>Swimming</item>

        <item>Hiking</item>

        <item>Golf</item>

        <item>Workshop</item>

        <item>Work</item>

        <item>Star</item>

        <item>Zen</item>

        <item>Managed</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 = 9;

    private static final int EXPECTED_NUMBER_OF_ICON_OPTIONS = 20;



    @Test

    public void iconResources_correctResources() {