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

Commit 6471850a authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Remove obsolete zen-related entries from CustomSiteMapRegistry" into main

parents b234ca21 c238b3b1

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

+5 −2
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package com.android.settings.search;



import android.app.Flags;

import android.util.ArrayMap;



import com.android.settings.backup.UserBackupSettingsActivity;
@@ -55,8 +56,10 @@ public class CustomSiteMapRegistry { 
                ConnectedDeviceDashboardFragment.class.getName());

        CUSTOM_SITE_MAP.put(UserBackupSettingsActivity.class.getName(),

                SystemDashboardFragment.class.getName());

        if (!Flags.modesUi()) {

            CUSTOM_SITE_MAP.put(ZenModeBlockedEffectsSettings.class.getName(),

                    ZenModeRestrictNotificationsSettings.class.getName());

        }

        CUSTOM_SITE_MAP.put(GestureNavigationSettingsFragment.class.getName(),

                SystemNavigationGestureSettings.class.getName());

    }

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

+20 −2
Original line number Diff line number Diff line
@@ -18,6 +18,12 @@ package com.android.settings.search; 


import static com.google.common.truth.Truth.assertThat;



import android.app.Flags;

import android.platform.test.annotations.RequiresFlagsDisabled;

import android.platform.test.annotations.RequiresFlagsEnabled;

import android.platform.test.flag.junit.CheckFlagsRule;

import android.platform.test.flag.junit.DeviceFlagsValueProvider;



import androidx.test.ext.junit.runners.AndroidJUnit4;



import com.android.settings.backup.UserBackupSettingsActivity;
@@ -35,12 +41,16 @@ import com.android.settings.security.SecuritySettings; 
import com.android.settings.security.screenlock.ScreenLockSettings;

import com.android.settings.system.SystemDashboardFragment;



import org.junit.Rule;

import org.junit.Test;

import org.junit.runner.RunWith;



@RunWith(AndroidJUnit4.class)

public class CustomSiteMapRegistryTest {



    @Rule

    public final CheckFlagsRule mCheckFlagsRule = DeviceFlagsValueProvider.createCheckFlagsRule();



    @Test

    public void shouldContainScreenLockSettingsPairs() {

        assertThat(CustomSiteMapRegistry.CUSTOM_SITE_MAP.get(ScreenLockSettings.class.getName()))
@@ -75,12 +85,20 @@ public class CustomSiteMapRegistryTest { 
    }



    @Test

    @RequiresFlagsDisabled(Flags.FLAG_MODES_UI)

    public void shouldContainZenModeBlockedEffectsSettingsPairs() {

        assertThat(CustomSiteMapRegistry.CUSTOM_SITE_MAP.get(

                ZenModeBlockedEffectsSettings.class.getName())).isEqualTo(

        assertThat(CustomSiteMapRegistry.CUSTOM_SITE_MAP).containsEntry(

                ZenModeBlockedEffectsSettings.class.getName(),

                ZenModeRestrictNotificationsSettings.class.getName());

    }



    @Test

    @RequiresFlagsEnabled(Flags.FLAG_MODES_UI)

    public void shouldNotContainZenModeBlockedEffectsSettingsPairs() {

        assertThat(CustomSiteMapRegistry.CUSTOM_SITE_MAP)

                .doesNotContainKey(ZenModeBlockedEffectsSettings.class.getName());

    }



    @Test

    public void shouldContainGestureNavigationSettingsFragmentPairs() {

        assertThat(CustomSiteMapRegistry.CUSTOM_SITE_MAP.get(