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

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

Browse Source
This commit is contained in:
Matías Hernández
2024-07-31 15:06:19 +00:00
committed by Android (Google) Code Review
parent 790fad6df0 0b7a22210a
commit ff2d85a6fe
2 changed files with 28 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
res/values/arrays.xml
View File

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

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

@@ -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() {