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

Commit 48660719 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Merge cherrypicks of ['googleplex-android-review.googlesource.com/31216799'] into 25Q1-release. 

Change-Id: Ibc22d2bde93ba0a6c2cb92da3b175e90e9bd3ab4
parents 954635a2 f496cf6f

src/com/android/settings/notification/modes/ZenModeTriggerUpdatePreferenceController.java

+5 −3
Original line number Diff line number Diff line
@@ -109,9 +109,11 @@ class ZenModeTriggerUpdatePreferenceController extends AbstractZenModePreference 
                    tryParseScheduleConditionId(mode.getRule().getConditionId());

            if (schedule != null) {

                preference.setTitle(SystemZenRules.getTimeSummary(mContext, schedule));

                preference.setSummary(Utils.createAccessibleSequence(

                        SystemZenRules.getDaysOfWeekShort(mContext, schedule),

                        SystemZenRules.getDaysOfWeekFull(mContext, schedule)));

                String shortDaysSummary = SystemZenRules.getDaysOfWeekShort(mContext, schedule);

                String fullDaysSummary = SystemZenRules.getDaysOfWeekFull(mContext, schedule);

                preference.setSummary(shortDaysSummary != null && fullDaysSummary != null

                        ? Utils.createAccessibleSequence(shortDaysSummary, fullDaysSummary)

                        : shortDaysSummary);

            } else {

                // Fallback, but shouldn't happen.

                Log.wtf(TAG, "SCHEDULE_TIME mode without schedule: " + mode);

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

+19 −0
Original line number Diff line number Diff line
@@ -309,6 +309,25 @@ public class ZenModeTriggerUpdatePreferenceControllerTest { 
                .isEqualTo(ZenModeSetScheduleFragment.class.getName());

    }



    @Test

    public void updateState_scheduleTimeRuleWithNoDays_emptySummary() {

        ZenModeConfig.ScheduleInfo scheduleInfo = new ZenModeConfig.ScheduleInfo();

        scheduleInfo.days = new int[] {};

        scheduleInfo.startHour = 1;

        scheduleInfo.endHour = 15;

        ZenMode mode = new TestModeBuilder()

                .setConditionId(ZenModeConfig.toScheduleConditionId(scheduleInfo))

                .setPackage(SystemZenRules.PACKAGE_ANDROID)

                .setType(TYPE_SCHEDULE_TIME)

                .setTriggerDescription("some schedule")

                .build();



        mController.updateState(mPreference, mode);



        assertThat(mPreference.getTitle()).isEqualTo("1:00 AM - 3:00 PM");

        assertThat(mPreference.getSummary()).isNull();

    }



    @Test

    public void updateState_appWithConfigActivity_showsLinkToConfigActivity() {

        ZenMode mode = new TestModeBuilder()