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

Commit 82282b48 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix breadcrumb for the search results of Custom restrictions page" into rvc-dev

parents eb04ef4f 24831244

src/com/android/settings/search/CustomSiteMapRegistry.java

+4 −0
Original line number Diff line number Diff line
@@ -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());

    }

}

tests/robotests/src/com/android/settings/search/CustomSiteMapRegistryTest.java

+9 −0
Original line number Diff line number Diff line
@@ -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());

    }

}