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

Commit 9471729a authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Use the DND icon for modes of type UNKNOWN" into main

parents c4645cd6 36ab93e9

core/res/res/values/symbols.xml

+0 −1
Original line number Diff line number Diff line
@@ -5647,7 +5647,6 @@ 
  <java-symbol type="drawable" name="ic_zen_mode_type_schedule_calendar" />

  <java-symbol type="drawable" name="ic_zen_mode_type_schedule_time" />

  <java-symbol type="drawable" name="ic_zen_mode_type_theater" />

  <java-symbol type="drawable" name="ic_zen_mode_type_unknown" />

  <java-symbol type="drawable" name="ic_zen_mode_type_special_dnd" />



  <!-- System notification for background user sound -->

packages/SettingsLib/src/com/android/settingslib/notification/modes/ZenIconKeys.java

+2 −2
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ class ZenIconKeys { 


    private static final ImmutableMap<Integer, ZenIcon.Key> TYPE_DEFAULTS = ImmutableMap.of(

            AutomaticZenRule.TYPE_UNKNOWN,

            ZenIcon.Key.forSystemResource(R.drawable.ic_zen_mode_type_unknown),

            ZenIcon.Key.forSystemResource(R.drawable.ic_zen_mode_type_special_dnd),

            AutomaticZenRule.TYPE_OTHER,

            ZenIcon.Key.forSystemResource(R.drawable.ic_zen_mode_type_other),

            AutomaticZenRule.TYPE_SCHEDULE_TIME,
@@ -61,7 +61,7 @@ class ZenIconKeys { 
    );



    private static final ZenIcon.Key FOR_UNEXPECTED_TYPE =

            ZenIcon.Key.forSystemResource(R.drawable.ic_zen_mode_type_unknown);

            ZenIcon.Key.forSystemResource(R.drawable.ic_zen_mode_type_special_dnd);



    /** Default icon descriptors per mode {@link AutomaticZenRule.Type}. */

    static ZenIcon.Key forType(@AutomaticZenRule.Type int ruleType) {