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

Changes to the trigger segment

Browse Source 
* Switch is always visible, even without a configuration activity
* Custom icon, title, and summary for some mode types (such as SCHEDULE_TIME, etc).
* Default texts in case of missing trigger description.
* Different icons for having/missing configuration activity.
* Move the section to the top of the screen.

Bug: 349376785
Test: atest ZenModeTriggerLinkPreferenceControllerTest
Flag: android.app.modes_ui
Change-Id: I960318899cf4da20ffc5765818429d5790d05067
This commit is contained in:
Matías Hernández
2024-07-23 17:50:35 +02:00
parent 51bb0fe4e4
commit 9e2ac046e4
6 changed files with 356 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

208
tests/robotests/src/com/android/settings/notification/modes/ZenModeSetTriggerLinkPreferenceControllerTest.java
View File

@@ -22,11 +22,15 @@ import static android.app.AutomaticZenRule.TYPE_SCHEDULE_TIME;
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.android.settings.notification.modes.ZenModeSetTriggerLinkPreferenceController.ADD_TRIGGER_KEY;
import static com.android.settings.notification.modes.ZenModeSetTriggerLinkPreferenceController.AUTOMATIC_TRIGGER_KEY;
import static com.android.settings.notification.modes.ZenModeSetTriggerLinkPreferenceControllerTest.CharSequenceTruth.assertThat;
import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -35,6 +39,7 @@ import android.app.AutomaticZenRule;
import android.app.Flags;
import android.content.Context;
import android.content.Intent;
import android.content.pm.ApplicationInfo;
import android.content.pm.PackageManager;
import android.net.Uri;
import android.platform.test.annotations.EnableFlags;
@@ -42,7 +47,11 @@ import android.platform.test.flag.junit.SetFlagsRule;
import android.service.notification.SystemZenRules;
import android.service.notification.ZenModeConfig;
import androidx.annotation.Nullable;
import androidx.preference.Preference;
import androidx.preference.PreferenceCategory;
import androidx.preference.PreferenceManager;
import androidx.preference.PreferenceScreen;
import androidx.test.core.app.ApplicationProvider;
import com.android.settings.R;
@@ -53,6 +62,9 @@ import com.android.settingslib.notification.modes.TestModeBuilder;
import com.android.settingslib.notification.modes.ZenMode;
import com.android.settingslib.notification.modes.ZenModesBackend;
import com.google.common.truth.StringSubject;
import com.google.common.truth.Truth;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
@@ -60,6 +72,7 @@ import org.junit.runner.RunWith;
import org.mockito.ArgumentCaptor;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.mockito.stubbing.Answer;
import org.robolectric.RobolectricTestRunner;
import java.util.Calendar;
@@ -74,32 +87,47 @@ public class ZenModeSetTriggerLinkPreferenceControllerTest {
private ZenModesBackend mBackend;
private Context mContext;
private PrimarySwitchPreference mPreference;
@Mock
private PackageManager mPm;
@Mock
private ConfigurationActivityHelper mConfigurationActivityHelper;
@Mock
private PreferenceCategory mPrefCategory;
private PrimarySwitchPreference mConfigPreference;
private Preference mAddPreference;
@Mock
private DashboardFragment mFragment;
private ZenModeSetTriggerLinkPreferenceController mPrefController;
private ZenModeSetTriggerLinkPreferenceController mController;
@Before
public void setUp() {
public void setUp() throws Exception {
MockitoAnnotations.initMocks(this);
mContext = ApplicationProvider.getApplicationContext();
mPrefController = new ZenModeSetTriggerLinkPreferenceController(mContext,
"zen_automatic_trigger_category", mFragment, mBackend,
mConfigurationActivityHelper,
mock(ZenServiceListing.class));
mPreference = new PrimarySwitchPreference(mContext);
PreferenceManager preferenceManager = new PreferenceManager(mContext);
PreferenceScreen preferenceScreen = preferenceManager.inflateFromResource(mContext,
R.xml.modes_rule_settings, null);
when(mPrefCategory.findPreference(AUTOMATIC_TRIGGER_PREF_KEY)).thenReturn(mPreference);
mController = new ZenModeSetTriggerLinkPreferenceController(mContext,
"zen_automatic_trigger_category", mFragment, mBackend, mPm,
mConfigurationActivityHelper, mock(ZenServiceListing.class));
mPrefCategory = preferenceScreen.findPreference("zen_automatic_trigger_category");
mConfigPreference = checkNotNull(mPrefCategory).findPreference(AUTOMATIC_TRIGGER_KEY);
mAddPreference = checkNotNull(mPrefCategory).findPreference(ADD_TRIGGER_KEY);
when(mPm.getApplicationInfo(any(), anyInt())).then(
(Answer<ApplicationInfo>) invocationOnMock -> {
ApplicationInfo appInfo = new ApplicationInfo();
appInfo.packageName = invocationOnMock.getArgument(0);
appInfo.labelRes = 1; // Whatever, but != 0 so that loadLabel calls PM.getText()
return appInfo;
});
when(mPm.getText(any(), anyInt(), any())).then(
(Answer<CharSequence>) invocationOnMock ->
"App named " + invocationOnMock.getArgument(0));
}
@Test
@@ -110,37 +138,37 @@ public class ZenModeSetTriggerLinkPreferenceControllerTest {
.setInterruptionFilter(INTERRUPTION_FILTER_PRIORITY)
.build(), true);
mPrefController.updateZenMode(mPrefCategory, manualMode);
assertThat(mPrefController.isAvailable()).isFalse();
mController.updateZenMode(mPrefCategory, manualMode);
assertThat(mController.isAvailable()).isFalse();
// should be available for other modes
mPrefController.updateZenMode(mPrefCategory, TestModeBuilder.EXAMPLE);
assertThat(mPrefController.isAvailable()).isTrue();
mController.updateZenMode(mPrefCategory, TestModeBuilder.EXAMPLE);
assertThat(mController.isAvailable()).isTrue();
}
@Test
public void testUpdateState() {
public void updateState_switchCheckedIfRuleEnabled() {
ZenMode zenMode = new TestModeBuilder().setEnabled(false).build();
// Update preference controller with a zen mode that is not enabled
mPrefController.updateZenMode(mPrefCategory, zenMode);
assertThat(mPreference.getCheckedState()).isFalse();
mController.updateZenMode(mPrefCategory, zenMode);
assertThat(mConfigPreference.getCheckedState()).isFalse();
// Now with the rule enabled
zenMode.getRule().setEnabled(true);
mPrefController.updateZenMode(mPrefCategory, zenMode);
assertThat(mPreference.getCheckedState()).isTrue();
mController.updateZenMode(mPrefCategory, zenMode);
assertThat(mConfigPreference.getCheckedState()).isTrue();
}
@Test
public void testOnPreferenceChange() {
public void onPreferenceChange_updatesMode() {
ZenMode zenMode = new TestModeBuilder().setEnabled(false).build();
// start with disabled rule
mPrefController.updateZenMode(mPrefCategory, zenMode);
mController.updateZenMode(mPrefCategory, zenMode);
// then update the preference to be checked
mPrefController.mSwitchChangeListener.onPreferenceChange(mPreference, true);
// then flip the switch
mConfigPreference.callChangeListener(true);
// verify the backend got asked to update the mode to be enabled
ArgumentCaptor<ZenMode> captor = ArgumentCaptor.forClass(ZenMode.class);
@@ -149,7 +177,7 @@ public class ZenModeSetTriggerLinkPreferenceControllerTest {
}
@Test
public void testRuleLink_calendar() {
public void updateState_scheduleCalendarRule() {
ZenModeConfig.EventInfo eventInfo = new ZenModeConfig.EventInfo();
eventInfo.calendarId = 1L;
eventInfo.calName = "My events";
@@ -159,23 +187,21 @@ public class ZenModeSetTriggerLinkPreferenceControllerTest {
.setType(TYPE_SCHEDULE_CALENDAR)
.setTriggerDescription("My events")
.build();
mPrefController.updateZenMode(mPrefCategory, mode);
assertThat(mPreference.getTitle()).isNotNull();
assertThat(mPreference.getTitle().toString()).isEqualTo(
mContext.getString(R.string.zen_mode_set_calendar_link));
assertThat(mPreference.getSummary()).isNotNull();
assertThat(mPreference.getSummary().toString()).isEqualTo(
mode.getRule().getTriggerDescription());
assertThat(mPreference.getIcon()).isNull();
mController.updateState(mPrefCategory, mode);
assertThat(mAddPreference.isVisible()).isFalse();
assertThat(mConfigPreference.isVisible()).isTrue();
assertThat(mConfigPreference.getTitle()).isEqualTo("Calendar events");
assertThat(mConfigPreference.getSummary()).isEqualTo("My events");
// Destination as written into the intent by SubSettingLauncher
assertThat(mPreference.getIntent().getStringExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT))
assertThat(
mConfigPreference.getIntent().getStringExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT))
.isEqualTo(ZenModeSetCalendarFragment.class.getName());
}
@Test
public void testRuleLink_schedule() {
public void updateState_scheduleTimeRule() {
ZenModeConfig.ScheduleInfo scheduleInfo = new ZenModeConfig.ScheduleInfo();
scheduleInfo.days = new int[]{Calendar.MONDAY, Calendar.TUESDAY, Calendar.THURSDAY};
scheduleInfo.startHour = 1;
@@ -186,44 +212,41 @@ public class ZenModeSetTriggerLinkPreferenceControllerTest {
.setType(TYPE_SCHEDULE_TIME)
.setTriggerDescription("some schedule")
.build();
mPrefController.updateZenMode(mPrefCategory, mode);
assertThat(mPreference.getTitle()).isNotNull();
assertThat(mPreference.getTitle().toString()).isEqualTo(
mContext.getString(R.string.zen_mode_set_schedule_link));
assertThat(mPreference.getSummary()).isNotNull();
assertThat(mPreference.getSummary().toString()).isEqualTo(
mode.getRule().getTriggerDescription());
assertThat(mPreference.getIcon()).isNull();
mController.updateState(mPrefCategory, mode);
assertThat(mAddPreference.isVisible()).isFalse();
assertThat(mConfigPreference.isVisible()).isTrue();
assertThat(mConfigPreference.getTitle()).isEqualTo("1:00 AM - 3:00 PM");
assertThat(mConfigPreference.getSummary()).isEqualTo("Mon - Tue, Thu");
// Destination as written into the intent by SubSettingLauncher
assertThat(mPreference.getIntent().getStringExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT))
assertThat(
mConfigPreference.getIntent().getStringExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT))
.isEqualTo(ZenModeSetScheduleFragment.class.getName());
}
@Test
public void testRuleLink_manual() {
public void updateState_customManualRule() {
ZenMode mode = new TestModeBuilder()
.setConditionId(ZenModeConfig.toCustomManualConditionId())
.setPackage(SystemZenRules.PACKAGE_ANDROID)
.setType(TYPE_OTHER)
.setTriggerDescription("Will not be shown")
.build();
mPrefController.updateZenMode(mPrefCategory, mode);
assertThat(mPreference.getTitle()).isNotNull();
assertThat(mPreference.getTitle().toString()).isEqualTo(
mController.updateState(mPrefCategory, mode);
assertThat(mConfigPreference.isVisible()).isFalse();
assertThat(mAddPreference.isVisible()).isTrue();
assertThat(mAddPreference.getTitle()).isEqualTo(
mContext.getString(R.string.zen_mode_select_schedule));
assertThat(mPreference.getIcon()).isNotNull();
assertThat(mPreference.getSummary()).isNotNull();
assertThat(mPreference.getSummary().toString()).isEqualTo("");
// Set up a click listener to open the dialog.
assertThat(mPreference.getOnPreferenceClickListener()).isNotNull();
assertThat(mAddPreference.getSummary()).isNull();
// Sets up a click listener to open the dialog.
assertThat(mAddPreference.getOnPreferenceClickListener()).isNotNull();
}
@Test
public void testRuleLink_appWithConfigActivity_linksToConfigActivity() {
public void updateState_appWithConfigActivity_showsLinkToConfigActivity() {
ZenMode mode = new TestModeBuilder()
.setPackage("some.package")
.setTriggerDescription("When The Music's Over")
@@ -232,28 +255,62 @@ public class ZenModeSetTriggerLinkPreferenceControllerTest {
when(mConfigurationActivityHelper.getConfigurationActivityIntentForMode(any(), any()))
.thenReturn(configurationIntent);
mPrefController.updateZenMode(mPrefCategory, mode);
mController.updateState(mPrefCategory, mode);
assertThat(mPreference.getTitle()).isNotNull();
assertThat(mPreference.getTitle().toString()).isEqualTo(
mContext.getString(R.string.zen_mode_configuration_link_title));
assertThat(mPreference.getSummary()).isNotNull();
assertThat(mPreference.getSummary().toString()).isEqualTo("When The Music's Over");
assertThat(mPreference.getIntent()).isEqualTo(configurationIntent);
assertThat(mConfigPreference.isVisible()).isTrue();
assertThat(mConfigPreference.getTitle()).isEqualTo("Linked to app");
assertThat(mConfigPreference.getSummary()).isEqualTo("When The Music's Over");
assertThat(mConfigPreference.getIntent()).isEqualTo(configurationIntent);
}
@Test
public void testRuleLink_appWithoutConfigActivity_hidden() {
public void updateState_appWithoutConfigActivity_showsWithoutLinkToConfigActivity() {
ZenMode mode = new TestModeBuilder()
.setPackage("some.package")
.setTriggerDescription("Will not be shown :(")
.setTriggerDescription("When the saints go marching in")
.build();
when(mConfigurationActivityHelper.getConfigurationActivityIntentForMode(any(), any()))
.thenReturn(null);
mPrefController.updateZenMode(mPrefCategory, mode);
mController.updateState(mPrefCategory, mode);
assertThat(mPrefCategory.isVisible()).isFalse();
assertThat(mConfigPreference.isVisible()).isTrue();
assertThat(mConfigPreference.getTitle()).isEqualTo("Linked to app");
assertThat(mConfigPreference.getSummary()).isEqualTo("When the saints go marching in");
assertThat(mConfigPreference.getIntent()).isNull();
}
@Test
public void updateState_appWithoutTriggerDescriptionWithConfigActivity_showsAppNameInSummary() {
ZenMode mode = new TestModeBuilder()
.setPackage("some.package")
.build();
Intent configurationIntent = new Intent("configure the mode");
when(mConfigurationActivityHelper.getConfigurationActivityIntentForMode(any(), any()))
.thenReturn(configurationIntent);
when(mPm.getText(any(), anyInt(), any())).thenReturn("The App Name");
mController.updateState(mPrefCategory, mode);
assertThat(mConfigPreference.isVisible()).isTrue();
assertThat(mConfigPreference.getTitle()).isEqualTo("Linked to app");
assertThat(mConfigPreference.getSummary()).isEqualTo("Info and settings in The App Name");
}
@Test
public void updateState_appWithoutTriggerDescriptionNorConfigActivity_showsAppNameInSummary() {
ZenMode mode = new TestModeBuilder()
.setPackage("some.package")
.build();
when(mConfigurationActivityHelper.getConfigurationActivityIntentForMode(any(), any()))
.thenReturn(null);
when(mPm.getText(any(), anyInt(), any())).thenReturn("The App Name");
mController.updateState(mPrefCategory, mode);
assertThat(mConfigPreference.isVisible()).isTrue();
assertThat(mConfigPreference.getTitle()).isEqualTo("Linked to app");
assertThat(mConfigPreference.getSummary()).isEqualTo("Managed by The App Name");
}
@Test
@@ -264,7 +321,7 @@ public class ZenModeSetTriggerLinkPreferenceControllerTest {
.setType(TYPE_OTHER)
.setTriggerDescription("")
.build();
mPrefController.updateZenMode(mPrefCategory, originalMode);
mController.updateZenMode(mPrefCategory, originalMode);
ZenModeConfig.ScheduleInfo scheduleInfo = new ZenModeConfig.ScheduleInfo();
scheduleInfo.days = new int[] { Calendar.MONDAY };
@@ -272,7 +329,7 @@ public class ZenModeSetTriggerLinkPreferenceControllerTest {
scheduleInfo.endHour = 15;
Uri scheduleUri = ZenModeConfig.toScheduleConditionId(scheduleInfo);
mPrefController.mOnScheduleOptionListener.onScheduleSelected(scheduleUri);
mController.mOnScheduleOptionListener.onScheduleSelected(scheduleUri);
// verify the backend got asked to update the mode to be schedule-based.
ArgumentCaptor<ZenMode> captor = ArgumentCaptor.forClass(ZenMode.class);
@@ -284,4 +341,17 @@ public class ZenModeSetTriggerLinkPreferenceControllerTest {
assertThat(updatedMode.getRule().getOwner()).isEqualTo(
ZenModeConfig.getScheduleConditionProvider());
}
static class CharSequenceTruth {
/**
* Shortcut version of {@link Truth#assertThat(String)} suitable for {@link CharSequence}.
* {@link CharSequence} doesn't necessarily provide a good {@code equals()} implementation;
* however we don't care about formatting here, so we want to assert on the resulting
* string (without needing to worry that {@code assertThat(x.getText().toString())} can
* throw if the text is null).
*/
static StringSubject assertThat(@Nullable CharSequence actual) {
return Truth.assertThat((String) (actual != null ? actual.toString() : null));
}
}
}