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

Commit 4fce42c4 authored by Yanting Yang's avatar Yanting Yang Committed by Android (Google) Code Review
Browse files

Merge "Correct breadcrumbs of Wallpaper & style" into sc-dev

parents f6d08457 6bf1c367

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

+0 −4
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ package com.android.settings.search; 


import android.util.ArrayMap;



import com.android.settings.DisplaySettings;

import com.android.settings.backup.UserBackupSettingsActivity;

import com.android.settings.connecteddevice.ConnectedDeviceDashboardFragment;

import com.android.settings.connecteddevice.usb.UsbDetailsFragment;
@@ -34,7 +33,6 @@ import com.android.settings.notification.zen.ZenModeRestrictNotificationsSetting 
import com.android.settings.security.SecuritySettings;

import com.android.settings.security.screenlock.ScreenLockSettings;

import com.android.settings.system.SystemDashboardFragment;

import com.android.settings.wallpaper.WallpaperSuggestionActivity;

import com.android.settings.wifi.WifiSettings;



import java.util.Map;
@@ -52,8 +50,6 @@ public class CustomSiteMapRegistry { 
    static {

        CUSTOM_SITE_MAP = new ArrayMap<>();

        CUSTOM_SITE_MAP.put(ScreenLockSettings.class.getName(), SecuritySettings.class.getName());

        CUSTOM_SITE_MAP.put(

                WallpaperSuggestionActivity.class.getName(), DisplaySettings.class.getName());

        CUSTOM_SITE_MAP.put(

                WifiSettings.class.getName(), NetworkDashboardFragment.class.getName());

        CUSTOM_SITE_MAP.put(PowerUsageAdvanced.class.getName(), PowerUsageSummary.class.getName());

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

+0 −9
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ import static com.google.common.truth.Truth.assertThat; 


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



import com.android.settings.DisplaySettings;

import com.android.settings.backup.UserBackupSettingsActivity;

import com.android.settings.connecteddevice.ConnectedDeviceDashboardFragment;

import com.android.settings.connecteddevice.usb.UsbDetailsFragment;
@@ -36,7 +35,6 @@ import com.android.settings.notification.zen.ZenModeRestrictNotificationsSetting 
import com.android.settings.security.SecuritySettings;

import com.android.settings.security.screenlock.ScreenLockSettings;

import com.android.settings.system.SystemDashboardFragment;

import com.android.settings.wallpaper.WallpaperSuggestionActivity;

import com.android.settings.wifi.WifiSettings;



import org.junit.Test;
@@ -51,13 +49,6 @@ public class CustomSiteMapRegistryTest { 
                .isEqualTo(SecuritySettings.class.getName());

    }



    @Test

    public void shouldContainWallpaperSuggestionActivityPairs() {

        assertThat(CustomSiteMapRegistry.CUSTOM_SITE_MAP.get(

                WallpaperSuggestionActivity.class.getName()))

                .isEqualTo(DisplaySettings.class.getName());

    }



    @Test

    public void shouldContainWifiSettingsPairs() {

        assertThat(CustomSiteMapRegistry.CUSTOM_SITE_MAP.get(WifiSettings.class.getName()))