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

Commit 24831244 authored by Yanting Yang's avatar Yanting Yang
Browse files

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
parent bdcff696

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());

    }

}