From 2483124478271096127c788f1c64cc46ba385680 Mon Sep 17 00:00:00 2001 From: Yanting Yang Date: Wed, 15 Apr 2020 08:41:53 +0800 Subject: [PATCH] Fix breadcrumb for the search results of Custom restrictions page Settings Search need Settings to provide the custom site map pairs to build up the full breadcrumb for the search results of Custom restrictions page. Impact search results: Don't turn on screen Don't wake for notifications Hide notification dots on app icons Hide status bar icons at top of screen Don't pop notifications on screen Hide from pull-down shade Custom restrictions Bug: 147851992 Bug: 151206664 Test: visual and robotests Change-Id: I01e359eabcdc362e2a1fde5f3bc4ae5dc6918030 --- .../android/settings/search/CustomSiteMapRegistry.java | 4 ++++ .../settings/search/CustomSiteMapRegistryTest.java | 9 +++++++++ 2 files changed, 13 insertions(+) diff --git a/src/com/android/settings/search/CustomSiteMapRegistry.java b/src/com/android/settings/search/CustomSiteMapRegistry.java index 756479b2495..afda72b2d68 100644 --- a/src/com/android/settings/search/CustomSiteMapRegistry.java +++ b/src/com/android/settings/search/CustomSiteMapRegistry.java @@ -27,6 +27,8 @@ import com.android.settings.fuelgauge.PowerUsageSummary; import com.android.settings.location.LocationSettings; import com.android.settings.location.RecentLocationRequestSeeAllFragment; import com.android.settings.network.NetworkDashboardFragment; +import com.android.settings.notification.zen.ZenModeBlockedEffectsSettings; +import com.android.settings.notification.zen.ZenModeRestrictNotificationsSettings; import com.android.settings.security.SecuritySettings; import com.android.settings.security.screenlock.ScreenLockSettings; import com.android.settings.system.SystemDashboardFragment; @@ -59,5 +61,7 @@ public class CustomSiteMapRegistry { ConnectedDeviceDashboardFragment.class.getName()); CUSTOM_SITE_MAP.put(UserBackupSettingsActivity.class.getName(), SystemDashboardFragment.class.getName()); + CUSTOM_SITE_MAP.put(ZenModeBlockedEffectsSettings.class.getName(), + ZenModeRestrictNotificationsSettings.class.getName()); } } diff --git a/tests/robotests/src/com/android/settings/search/CustomSiteMapRegistryTest.java b/tests/robotests/src/com/android/settings/search/CustomSiteMapRegistryTest.java index 5c78a6bde68..a3e88d96ca3 100644 --- a/tests/robotests/src/com/android/settings/search/CustomSiteMapRegistryTest.java +++ b/tests/robotests/src/com/android/settings/search/CustomSiteMapRegistryTest.java @@ -27,6 +27,8 @@ import com.android.settings.fuelgauge.PowerUsageSummary; import com.android.settings.location.LocationSettings; import com.android.settings.location.RecentLocationRequestSeeAllFragment; import com.android.settings.network.NetworkDashboardFragment; +import com.android.settings.notification.zen.ZenModeBlockedEffectsSettings; +import com.android.settings.notification.zen.ZenModeRestrictNotificationsSettings; import com.android.settings.security.SecuritySettings; import com.android.settings.security.screenlock.ScreenLockSettings; import com.android.settings.system.SystemDashboardFragment; @@ -85,4 +87,11 @@ public class CustomSiteMapRegistryTest { UserBackupSettingsActivity.class.getName())).isEqualTo( SystemDashboardFragment.class.getName()); } + + @Test + public void shouldContainZenModeBlockedEffectsSettingsPairs() { + assertThat(CustomSiteMapRegistry.CUSTOM_SITE_MAP.get( + ZenModeBlockedEffectsSettings.class.getName())).isEqualTo( + ZenModeRestrictNotificationsSettings.class.getName()); + } }