Add page for choosing calendar & reply for event modes.

Also adds the link to set trigger behavior to the main mode page (only for calendar so far), and the switch preference to enable/disable automatic rules (for all but manual DND mode).

Removes the "escape hatch" to allow manual mode to also use the new modes pages.

Ported from ZenModeEventRuleSettings.

Flag: android.app.modes_ui
Bug: 332730302
Test: ZenModeSetCalendarPreferenceControllerTest, ZenModeSetTriggerLinkPreferenceControllerTest, manual
Change-Id: Ia7a716c66663a21494a6c05711250a5bda87ca8c
This commit is contained in:
Yuri Lin
2024-05-22 11:08:13 -04:00
parent e968a66489
commit f29f44296a
11 changed files with 808 additions and 17 deletions

View File

@@ -7947,6 +7947,18 @@
<!-- Do not disturb: Title for a specific zen mode automatic rule in settings. [CHAR LIMIT=30] --> <!-- Do not disturb: Title for a specific zen mode automatic rule in settings. [CHAR LIMIT=30] -->
<string name="zen_mode_automatic_rule_settings_page_title">Schedule</string> <string name="zen_mode_automatic_rule_settings_page_title">Schedule</string>
<!-- Do not disturb: Title for settings section describing when the rule turns on automatically [CHAR LIMIT=30] -->
<string name="zen_mode_automatic_trigger_title">Turn on automatically</string>
<!-- Do not disturb: Title prompting a user to choose a calendar to use for an automatic rule [CHAR LIMIT=30] -->
<string name="zen_mode_set_calendar_title">Add a calendar</string>
<!-- Do not disturb: Link text prompting a user to click through to setting a calendar [CHAR LIMIT=40] -->
<string name="zen_mode_set_calendar_link">Use your calendar</string>
<!-- Do not disturb: Title on the page where users choose a calendar to determine the schedule for an automatically-triggered DND rule. [CHAR LIMIT=30] -->
<string name="zen_mode_set_calendar_category_title">Schedule</string>
<!-- Do not disturb: Title do not disturb settings representing automatic (scheduled) do not disturb rules. [CHAR LIMIT=30] --> <!-- Do not disturb: Title do not disturb settings representing automatic (scheduled) do not disturb rules. [CHAR LIMIT=30] -->
<string name="zen_mode_schedule_category_title">Schedule</string> <string name="zen_mode_schedule_category_title">Schedule</string>

View File

@@ -16,6 +16,7 @@
--> -->
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:settings="http://schemas.android.com/apk/res-auto"
android:title="@string/zen_modes_list_title" > android:title="@string/zen_modes_list_title" >
<com.android.settingslib.widget.LayoutPreference <com.android.settingslib.widget.LayoutPreference
@@ -43,6 +44,14 @@
android:title="@string/zen_category_exceptions" /> android:title="@string/zen_category_exceptions" />
</PreferenceCategory> </PreferenceCategory>
<!-- automatic trigger section; preference changes programmatically depending on type -->
<PreferenceCategory
android:key="zen_automatic_trigger_category"
android:title="@string/zen_mode_automatic_trigger_title">
<com.android.settingslib.PrimarySwitchPreference
android:key="zen_automatic_trigger_settings" />
</PreferenceCategory>
<PreferenceCategory <PreferenceCategory
android:title="@string/mode_device_effects_title" android:title="@string/mode_device_effects_title"
android:key="modes_additional_actions"> android:key="modes_additional_actions">

View File

@@ -0,0 +1,44 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2024 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
<PreferenceScreen
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:settings="http://schemas.android.com/apk/res-auto"
android:key="zen_mode_set_calendar"
settings:searchable="false"
android:title="@string/zen_mode_set_calendar_title">
<PreferenceCategory
android:key="zen_mode_event_category"
android:title="@string/zen_mode_set_calendar_category_title">
<!-- TODO: b/333682392 - use correct strings for below two prefs -->
<!-- During events for -->
<DropDownPreference
android:key="calendar"
android:title="@string/zen_mode_event_rule_calendar"
android:summary="%s" />
<!-- Where reply is -->
<DropDownPreference
android:key="reply"
android:title="@string/zen_mode_event_rule_reply"
android:summary="%s" />
</PreferenceCategory>
</PreferenceScreen>

View File

@@ -46,6 +46,8 @@ public class ZenModeFragment extends ZenModeFragmentBase {
context, "zen_other_settings", mBackend)); context, "zen_other_settings", mBackend));
prefControllers.add(new ZenModeDisplayLinkPreferenceController( prefControllers.add(new ZenModeDisplayLinkPreferenceController(
context, "mode_display_settings", mBackend)); context, "mode_display_settings", mBackend));
prefControllers.add(new ZenModeSetTriggerLinkPreferenceController(context,
"zen_automatic_trigger_category", mBackend));
return prefControllers; return prefControllers;
} }

View File

@@ -103,6 +103,7 @@ abstract class ZenModeFragmentBase extends ZenModesFragmentBase {
if (!reloadMode(id)) { if (!reloadMode(id)) {
Log.d(TAG, "Mode id=" + id + " not found"); Log.d(TAG, "Mode id=" + id + " not found");
toastAndFinish(); toastAndFinish();
return;
} }
updateControllers(); updateControllers();
} }

View File

@@ -22,7 +22,6 @@ import android.content.Context;
import android.os.Bundle; import android.os.Bundle;
import com.android.settings.core.SubSettingLauncher; import com.android.settings.core.SubSettingLauncher;
import com.android.settings.notification.zen.ZenModeSettings;
import com.android.settingslib.RestrictedPreference; import com.android.settingslib.RestrictedPreference;
/** /**
@@ -42,22 +41,13 @@ class ZenModeListPreference extends RestrictedPreference {
@Override @Override
public void onClick() { public void onClick() {
// TODO: b/322373473 - This implementation is a hack that just leads to the old DND page Bundle bundle = new Bundle();
// for manual only; remove this in favor of the real implementation. bundle.putString(MODE_ID, mZenMode.getId());
if (mZenMode.isManualDnd()) { new SubSettingLauncher(mContext)
new SubSettingLauncher(mContext) .setDestination(ZenModeFragment.class.getName())
.setDestination(ZenModeSettings.class.getName()) .setArguments(bundle)
.setSourceMetricsCategory(SettingsEnums.NOTIFICATION_ZEN_MODE) .setSourceMetricsCategory(SettingsEnums.NOTIFICATION_ZEN_MODE_AUTOMATION)
.launch(); .launch();
} else {
Bundle bundle = new Bundle();
bundle.putString(MODE_ID, mZenMode.getId());
new SubSettingLauncher(mContext)
.setDestination(ZenModeFragment.class.getName())
.setArguments(bundle)
.setSourceMetricsCategory(SettingsEnums.NOTIFICATION_ZEN_MODE_AUTOMATION)
.launch();
}
} }
public void setZenMode(ZenMode zenMode) { public void setZenMode(ZenMode zenMode) {

View File

@@ -0,0 +1,52 @@
/*
* Copyright (C) 2024 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.android.settings.notification.modes;
import android.app.settings.SettingsEnums;
import android.content.Context;
import com.android.settings.R;
import com.android.settingslib.core.AbstractPreferenceController;
import java.util.ArrayList;
import java.util.List;
/**
* Page for choosing calendar and reply type for a scheduled mode that triggers on events.
*/
public class ZenModeSetCalendarFragment extends ZenModeFragmentBase {
@Override
protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
List<AbstractPreferenceController> controllers = new ArrayList<>();
controllers.add(
new ZenModeSetCalendarPreferenceController(context, "zen_mode_event_category",
mBackend));
return controllers;
}
@Override
protected int getPreferenceScreenResId() {
return R.xml.modes_set_calendar;
}
@Override
public int getMetricsCategory() {
// TODO: b/332937635 - make this the correct metrics category
return SettingsEnums.NOTIFICATION_ZEN_MODE_EVENT_RULE;
}
}

View File

@@ -0,0 +1,264 @@
/*
* Copyright (C) 2024 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.android.settings.notification.modes;
import android.app.Flags;
import android.content.Context;
import android.content.pm.PackageManager;
import android.database.Cursor;
import android.os.UserHandle;
import android.os.UserManager;
import android.provider.CalendarContract;
import android.service.notification.SystemZenRules;
import android.service.notification.ZenModeConfig;
import androidx.annotation.NonNull;
import androidx.preference.DropDownPreference;
import androidx.preference.Preference;
import androidx.preference.PreferenceCategory;
import com.android.internal.annotations.VisibleForTesting;
import com.android.settings.R;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
import java.util.Objects;
import java.util.function.Function;
public class ZenModeSetCalendarPreferenceController extends AbstractZenModePreferenceController {
@VisibleForTesting
protected static final String KEY_CALENDAR = "calendar";
@VisibleForTesting
protected static final String KEY_REPLY = "reply";
private DropDownPreference mCalendar;
private DropDownPreference mReply;
private ZenModeConfig.EventInfo mEvent;
public ZenModeSetCalendarPreferenceController(Context context, String key,
ZenModesBackend backend) {
super(context, key, backend);
}
@Override
public void updateState(Preference preference, @NonNull ZenMode zenMode) {
PreferenceCategory cat = (PreferenceCategory) preference;
// Refresh our understanding of local preferences
mCalendar = cat.findPreference(KEY_CALENDAR);
mReply = cat.findPreference(KEY_REPLY);
if (mCalendar == null || mReply == null) {
return;
}
mCalendar.setOnPreferenceChangeListener(mCalendarChangeListener);
mReply.setEntries(new CharSequence[] {
mContext.getString(R.string.zen_mode_event_rule_reply_any_except_no),
mContext.getString(R.string.zen_mode_event_rule_reply_yes_or_maybe),
mContext.getString(R.string.zen_mode_event_rule_reply_yes),
});
mReply.setEntryValues(new CharSequence[] {
Integer.toString(ZenModeConfig.EventInfo.REPLY_ANY_EXCEPT_NO),
Integer.toString(ZenModeConfig.EventInfo.REPLY_YES_OR_MAYBE),
Integer.toString(ZenModeConfig.EventInfo.REPLY_YES),
});
mReply.setOnPreferenceChangeListener(mReplyChangeListener);
// Parse the zen mode's condition to update our EventInfo object.
mEvent = ZenModeConfig.tryParseEventConditionId(zenMode.getRule().getConditionId());
if (mEvent != null) {
reloadCalendar();
updatePrefValues();
}
}
private void reloadCalendar() {
List<CalendarInfo> calendars = getCalendars(mContext);
ArrayList<CharSequence> entries = new ArrayList<>();
ArrayList<CharSequence> values = new ArrayList<>();
entries.add(mContext.getString(R.string.zen_mode_event_rule_calendar_any));
values.add(key(0, null, ""));
final String eventCalendar = mEvent != null ? mEvent.calName : null;
for (CalendarInfo calendar : calendars) {
entries.add(calendar.name);
values.add(key(calendar));
if (eventCalendar != null && (mEvent.calendarId == null
&& eventCalendar.equals(calendar.name))) {
mEvent.calendarId = calendar.calendarId;
}
}
CharSequence[] entriesArr = entries.toArray(new CharSequence[entries.size()]);
CharSequence[] valuesArr = values.toArray(new CharSequence[values.size()]);
if (!Arrays.equals(mCalendar.getEntries(), entriesArr)) {
mCalendar.setEntries(entriesArr);
}
if (!Arrays.equals(mCalendar.getEntryValues(), valuesArr)) {
mCalendar.setEntryValues(valuesArr);
}
}
@VisibleForTesting
protected Function<ZenMode, ZenMode> updateEventMode(ZenModeConfig.EventInfo event) {
return (zenMode) -> {
zenMode.getRule().setConditionId(ZenModeConfig.toEventConditionId(event));
if (Flags.modesApi() && Flags.modesUi()) {
zenMode.getRule().setTriggerDescription(
SystemZenRules.getTriggerDescriptionForScheduleEvent(mContext, event));
}
return zenMode;
};
}
Preference.OnPreferenceChangeListener mCalendarChangeListener =
new Preference.OnPreferenceChangeListener() {
@Override
public boolean onPreferenceChange(Preference preference, Object newValue) {
final String calendarKey = (String) newValue;
if (calendarKey.equals(key(mEvent))) return false;
String[] key = calendarKey.split(":", 3);
mEvent.userId = Integer.parseInt(key[0]);
mEvent.calendarId = key[1].equals("") ? null : Long.parseLong(key[1]);
mEvent.calName = key[2].equals("") ? null : key[2];
saveMode(updateEventMode(mEvent));
return true;
}
};
Preference.OnPreferenceChangeListener mReplyChangeListener =
new Preference.OnPreferenceChangeListener() {
@Override
public boolean onPreferenceChange(Preference preference, Object newValue) {
final int reply = Integer.parseInt((String) newValue);
if (reply == mEvent.reply) return false;
mEvent.reply = reply;
saveMode(updateEventMode(mEvent));
return true;
}
};
private void updatePrefValues() {
if (!Objects.equals(mCalendar.getValue(), key(mEvent))) {
mCalendar.setValue(key(mEvent));
}
if (!Objects.equals(mReply.getValue(), Integer.toString(mEvent.reply))) {
mReply.setValue(Integer.toString(mEvent.reply));
}
}
private List<CalendarInfo> getCalendars(Context context) {
final List<CalendarInfo> calendars = new ArrayList<>();
for (UserHandle user : UserManager.get(context).getUserProfiles()) {
final Context userContext = getContextForUser(context, user);
if (userContext != null) {
addCalendars(userContext, calendars);
}
}
Collections.sort(calendars, CALENDAR_NAME);
return calendars;
}
private static Context getContextForUser(Context context, UserHandle user) {
try {
return context.createPackageContextAsUser(context.getPackageName(), 0, user);
} catch (PackageManager.NameNotFoundException e) {
return null;
}
}
private void addCalendars(Context context, List<CalendarInfo> outCalendars) {
final String[] projection =
{CalendarContract.Calendars._ID, CalendarContract.Calendars.CALENDAR_DISPLAY_NAME};
final String selection = CalendarContract.Calendars.CALENDAR_ACCESS_LEVEL + " >= "
+ CalendarContract.Calendars.CAL_ACCESS_CONTRIBUTOR
+ " AND " + CalendarContract.Calendars.SYNC_EVENTS + " = 1";
Cursor cursor = null;
try {
cursor = context.getContentResolver().query(CalendarContract.Calendars.CONTENT_URI,
projection, selection, null, null);
if (cursor == null) {
return;
}
while (cursor.moveToNext()) {
addCalendar(cursor.getLong(0), cursor.getString(1),
context.getUserId(), outCalendars);
}
} finally {
if (cursor != null) {
cursor.close();
}
}
}
@VisibleForTesting
protected static void addCalendar(long calendarId, String calName, int userId,
List<CalendarInfo> outCalendars) {
final CalendarInfo ci = new CalendarInfo();
ci.calendarId = calendarId;
ci.name = calName;
ci.userId = userId;
if (!outCalendars.contains(ci)) {
outCalendars.add(ci);
}
}
private static String key(CalendarInfo calendar) {
return key(calendar.userId, calendar.calendarId, calendar.name);
}
private static String key(ZenModeConfig.EventInfo event) {
return key(event.userId, event.calendarId, event.calName);
}
@VisibleForTesting
protected static String key(int userId, Long calendarId, String displayName) {
return ZenModeConfig.EventInfo.resolveUserId(userId) + ":"
+ (calendarId == null ? "" : calendarId)
+ ":" + (displayName == null ? "" : displayName);
}
@VisibleForTesting
protected static final Comparator<CalendarInfo> CALENDAR_NAME = Comparator.comparing(
lhs -> lhs.name);
public static class CalendarInfo {
public String name;
public int userId;
public Long calendarId;
@Override
public boolean equals(Object o) {
if (!(o instanceof CalendarInfo)) return false;
if (o == this) return true;
final CalendarInfo other = (CalendarInfo) o;
return Objects.equals(other.name, name)
&& Objects.equals(other.calendarId, calendarId);
}
@Override
public int hashCode() {
return Objects.hash(name, calendarId);
}
}
}

View File

@@ -0,0 +1,96 @@
/*
* Copyright (C) 2024 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.android.settings.notification.modes;
import static android.app.AutomaticZenRule.TYPE_SCHEDULE_CALENDAR;
import static com.android.settings.notification.modes.ZenModeFragmentBase.MODE_ID;
import android.content.Context;
import android.os.Bundle;
import androidx.annotation.NonNull;
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import androidx.preference.PreferenceCategory;
import com.android.settings.R;
import com.android.settings.core.SubSettingLauncher;
import com.android.settingslib.PrimarySwitchPreference;
/**
* Preference controller for the link
*/
public class ZenModeSetTriggerLinkPreferenceController extends AbstractZenModePreferenceController {
@VisibleForTesting
protected static final String AUTOMATIC_TRIGGER_PREF_KEY = "zen_automatic_trigger_settings";
public ZenModeSetTriggerLinkPreferenceController(Context context, String key,
ZenModesBackend backend) {
super(context, key, backend);
}
@Override
public boolean isAvailable(@NonNull ZenMode zenMode) {
return !zenMode.isManualDnd();
}
@Override
public void updateState(Preference preference, @NonNull ZenMode zenMode) {
// This controller is expected to govern a preference category so that it controls the
// availability of the entire preference category if the mode doesn't have a way to
// automatically trigger (such as manual DND).
Preference switchPref = ((PreferenceCategory) preference).findPreference(
AUTOMATIC_TRIGGER_PREF_KEY);
if (switchPref == null) {
return;
}
((PrimarySwitchPreference) switchPref).setChecked(zenMode.getRule().isEnabled());
switchPref.setOnPreferenceChangeListener(mSwitchChangeListener);
Bundle bundle = new Bundle();
bundle.putString(MODE_ID, zenMode.getId());
// TODO: b/341961712 - direct preference to app-owned intent if available
switch (zenMode.getRule().getType()) {
case TYPE_SCHEDULE_CALENDAR:
switchPref.setTitle(R.string.zen_mode_set_calendar_link);
switchPref.setSummary(zenMode.getRule().getTriggerDescription());
switchPref.setIntent(new SubSettingLauncher(mContext)
.setDestination(ZenModeSetCalendarFragment.class.getName())
// TODO: b/332937635 - set correct metrics category
.setSourceMetricsCategory(0)
.setArguments(bundle)
.toIntent());
break;
default:
// TODO: b/342156843 - change this to allow adding a trigger condition for system
// rules that don't yet have a type selected
switchPref.setTitle("not implemented");
}
}
@VisibleForTesting
protected Preference.OnPreferenceChangeListener mSwitchChangeListener = (p, newValue) -> {
final boolean newEnabled = (Boolean) newValue;
return saveMode((zenMode) -> {
if (newEnabled != zenMode.getRule().isEnabled()) {
zenMode.getRule().setEnabled(newEnabled);
}
return zenMode;
});
};
}

View File

@@ -0,0 +1,151 @@
/*
* Copyright (C) 2024 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.android.settings.notification.modes;
import static android.platform.test.flag.junit.SetFlagsRule.DefaultInitValueType.DEVICE_DEFAULT;
import static android.service.notification.ZenModeConfig.EventInfo.REPLY_YES;
import static com.android.settings.notification.modes.ZenModeSetCalendarPreferenceController.CALENDAR_NAME;
import static com.android.settings.notification.modes.ZenModeSetCalendarPreferenceController.KEY_CALENDAR;
import static com.android.settings.notification.modes.ZenModeSetCalendarPreferenceController.KEY_REPLY;
import static com.android.settings.notification.modes.ZenModeSetCalendarPreferenceController.addCalendar;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.when;
import android.app.AutomaticZenRule;
import android.app.Flags;
import android.content.Context;
import android.net.Uri;
import android.platform.test.annotations.EnableFlags;
import android.platform.test.flag.junit.SetFlagsRule;
import android.service.notification.ZenModeConfig;
import androidx.preference.DropDownPreference;
import androidx.preference.PreferenceCategory;
import androidx.test.core.app.ApplicationProvider;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RobolectricTestRunner;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@RunWith(RobolectricTestRunner.class)
public class ZenModeSetCalendarPreferenceControllerTest {
@Rule
public final SetFlagsRule mSetFlagsRule = new SetFlagsRule(DEVICE_DEFAULT);
@Mock
private ZenModesBackend mBackend;
private Context mContext;
@Mock
private PreferenceCategory mPrefCategory;
private DropDownPreference mCalendar, mReply;
private ZenModeSetCalendarPreferenceController mPrefController;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
mContext = ApplicationProvider.getApplicationContext();
mCalendar = new DropDownPreference(mContext);
mReply = new DropDownPreference(mContext);
when(mPrefCategory.findPreference(KEY_CALENDAR)).thenReturn(mCalendar);
when(mPrefCategory.findPreference(KEY_REPLY)).thenReturn(mReply);
mPrefController = new ZenModeSetCalendarPreferenceController(mContext,
"zen_mode_event_category", mBackend);
}
@Test
@EnableFlags({Flags.FLAG_MODES_API, Flags.FLAG_MODES_UI})
public void updateEventMode_updatesConditionAndTriggerDescription() {
ZenMode mode = new ZenMode("id",
new AutomaticZenRule.Builder("name", Uri.parse("condition")).build(),
true); // is active
// Explicitly update preference controller with mode info first, which will also call
// updateState()
mPrefController.updateZenMode(mPrefCategory, mode);
ZenModeConfig.EventInfo eventInfo = new ZenModeConfig.EventInfo();
eventInfo.calendarId = 1L;
eventInfo.calName = "My events";
// apply event mode updater to existing mode
ZenMode out = mPrefController.updateEventMode(eventInfo).apply(mode);
assertThat(out.getRule().getConditionId()).isEqualTo(
ZenModeConfig.toEventConditionId(eventInfo));
assertThat(out.getRule().getTriggerDescription()).isEqualTo("My events");
}
@Test
public void updateState_setsPreferenceValues() {
ZenModeConfig.EventInfo eventInfo = new ZenModeConfig.EventInfo();
eventInfo.calendarId = 1L;
eventInfo.calName = "Definitely A Calendar";
eventInfo.reply = REPLY_YES;
ZenMode mode = new ZenMode("id",
new AutomaticZenRule.Builder("name",
ZenModeConfig.toEventConditionId(eventInfo)).build(),
true); // is active
mPrefController.updateZenMode(mPrefCategory, mode);
// We should see mCalendar, mReply have their values set
assertThat(mCalendar.getValue()).isEqualTo(
ZenModeSetCalendarPreferenceController.key(eventInfo.userId, eventInfo.calendarId,
eventInfo.calName));
assertThat(mReply.getValue()).isEqualTo(Integer.toString(eventInfo.reply));
}
@Test
public void testNoDuplicateCalendars() {
List<ZenModeSetCalendarPreferenceController.CalendarInfo> calendarsList = new ArrayList<>();
addCalendar(1234, "calName", 1, calendarsList);
addCalendar(1234, "calName", 2, calendarsList);
addCalendar(1234, "calName", 3, calendarsList);
assertThat(calendarsList).hasSize(1);
}
@Test
public void testCalendarInfoSortByName() {
List<ZenModeSetCalendarPreferenceController.CalendarInfo> calendarsList = new ArrayList<>();
addCalendar(123, "zyx", 1, calendarsList);
addCalendar(456, "wvu", 2, calendarsList);
addCalendar(789, "abc", 3, calendarsList);
Collections.sort(calendarsList, CALENDAR_NAME);
List<ZenModeSetCalendarPreferenceController.CalendarInfo> sortedList = new ArrayList<>();
addCalendar(789, "abc", 3, sortedList);
addCalendar(456, "wvu", 2, sortedList);
addCalendar(123, "zyx", 1, sortedList);
assertThat(calendarsList).containsExactlyElementsIn(sortedList).inOrder();
}
}

View File

@@ -0,0 +1,170 @@
/*
* Copyright (C) 2024 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.android.settings.notification.modes;
import static android.app.AutomaticZenRule.TYPE_SCHEDULE_CALENDAR;
import static android.app.NotificationManager.INTERRUPTION_FILTER_PRIORITY;
import static android.platform.test.flag.junit.SetFlagsRule.DefaultInitValueType.DEVICE_DEFAULT;
import static com.android.settings.notification.modes.ZenModeSetTriggerLinkPreferenceController.AUTOMATIC_TRIGGER_PREF_KEY;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import android.app.AutomaticZenRule;
import android.app.Flags;
import android.content.Context;
import android.content.Intent;
import android.net.Uri;
import android.platform.test.annotations.EnableFlags;
import android.platform.test.flag.junit.SetFlagsRule;
import android.service.notification.ZenModeConfig;
import android.service.notification.ZenPolicy;
import androidx.preference.PreferenceCategory;
import androidx.test.core.app.ApplicationProvider;
import com.android.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settingslib.PrimarySwitchPreference;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.ArgumentCaptor;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RobolectricTestRunner;
@RunWith(RobolectricTestRunner.class)
public class ZenModeSetTriggerLinkPreferenceControllerTest {
@Rule
public final SetFlagsRule mSetFlagsRule = new SetFlagsRule(DEVICE_DEFAULT);
@Mock
private ZenModesBackend mBackend;
private Context mContext;
@Mock
private PreferenceCategory mPrefCategory;
@Mock
private PrimarySwitchPreference mPreference;
private ZenModeSetTriggerLinkPreferenceController mPrefController;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
mContext = ApplicationProvider.getApplicationContext();
mPrefController = new ZenModeSetTriggerLinkPreferenceController(mContext,
"zen_automatic_trigger_category", mBackend);
when(mPrefCategory.findPreference(AUTOMATIC_TRIGGER_PREF_KEY)).thenReturn(mPreference);
}
@Test
@EnableFlags(Flags.FLAG_MODES_UI)
public void testIsAvailable() {
// should not be available for manual DND
ZenMode manualMode = ZenMode.manualDndMode(new AutomaticZenRule.Builder("Do Not Disturb",
Uri.parse("manual"))
.setInterruptionFilter(INTERRUPTION_FILTER_PRIORITY)
.build(), true);
mPrefController.updateZenMode(mPrefCategory, manualMode);
assertThat(mPrefController.isAvailable()).isFalse();
// should be available for other modes
ZenMode zenMode = new ZenMode("id",
new AutomaticZenRule.Builder("Driving", Uri.parse("drive"))
.setType(AutomaticZenRule.TYPE_DRIVING)
.setInterruptionFilter(INTERRUPTION_FILTER_PRIORITY)
.setZenPolicy(new ZenPolicy.Builder().allowAlarms(true).build())
.setEnabled(false)
.build(), false);
mPrefController.updateZenMode(mPrefCategory, zenMode);
assertThat(mPrefController.isAvailable()).isTrue();
}
@Test
public void testUpdateState() {
ZenMode zenMode = new ZenMode("id",
new AutomaticZenRule.Builder("Driving", Uri.parse("drive"))
.setType(AutomaticZenRule.TYPE_DRIVING)
.setInterruptionFilter(INTERRUPTION_FILTER_PRIORITY)
.setZenPolicy(new ZenPolicy.Builder().allowAlarms(true).build())
.setEnabled(false)
.build(), false);
// Update preference controller with a zen mode that is not enabled
mPrefController.updateZenMode(mPrefCategory, zenMode);
verify(mPreference).setChecked(false);
// Now with the rule enabled
zenMode.getRule().setEnabled(true);
mPrefController.updateZenMode(mPrefCategory, zenMode);
verify(mPreference).setChecked(true);
}
@Test
public void testOnPreferenceChange() {
ZenMode zenMode = new ZenMode("id",
new AutomaticZenRule.Builder("Driving", Uri.parse("drive"))
.setType(AutomaticZenRule.TYPE_DRIVING)
.setInterruptionFilter(INTERRUPTION_FILTER_PRIORITY)
.setZenPolicy(new ZenPolicy.Builder().allowAlarms(true).build())
.setEnabled(false)
.build(), false);
// start with disabled rule
mPrefController.updateZenMode(mPrefCategory, zenMode);
// then update the preference to be checked
mPrefController.mSwitchChangeListener.onPreferenceChange(mPreference, true);
// verify the backend got asked to update the mode to be enabled
ArgumentCaptor<ZenMode> captor = ArgumentCaptor.forClass(ZenMode.class);
verify(mBackend).updateMode(captor.capture());
assertThat(captor.getValue().getRule().isEnabled()).isTrue();
}
@Test
public void testRuleLink_calendar() {
ZenModeConfig.EventInfo eventInfo = new ZenModeConfig.EventInfo();
eventInfo.calendarId = 1L;
eventInfo.calName = "My events";
ZenMode mode = new ZenMode("id", new AutomaticZenRule.Builder("name",
ZenModeConfig.toEventConditionId(eventInfo))
.setType(TYPE_SCHEDULE_CALENDAR)
.setTriggerDescription("My events")
.build(),
true); // is active
mPrefController.updateZenMode(mPrefCategory, mode);
verify(mPreference).setTitle(R.string.zen_mode_set_calendar_link);
verify(mPreference).setSummary(mode.getRule().getTriggerDescription());
ArgumentCaptor<Intent> captor = ArgumentCaptor.forClass(Intent.class);
verify(mPreference).setIntent(captor.capture());
// Destination as written into the intent by SubSettingLauncher
assertThat(
captor.getValue().getStringExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT)).isEqualTo(
ZenModeSetCalendarFragment.class.getName());
}
}