From bfe16291a3d386af53ba142b1b3e2f95e11f1d80 Mon Sep 17 00:00:00 2001 From: Yanting Yang Date: Tue, 21 Apr 2020 19:11:45 +0800 Subject: [PATCH] Fix breadcrumb of search results provided by Settings Settings Search need Settings to provide custom site map pairs to build up full breadcrumb for the search results from Gesture Settings page. Bug: 147851992 Bug: 151206664 Test: visual and robotests Change-Id: I4a61e6da48755184954c2c90834578030ffc2e10 --- .../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 afda72b2d68..f1c62111404 100644 --- a/src/com/android/settings/search/CustomSiteMapRegistry.java +++ b/src/com/android/settings/search/CustomSiteMapRegistry.java @@ -24,6 +24,8 @@ import com.android.settings.connecteddevice.ConnectedDeviceDashboardFragment; import com.android.settings.connecteddevice.usb.UsbDetailsFragment; import com.android.settings.fuelgauge.PowerUsageAdvanced; import com.android.settings.fuelgauge.PowerUsageSummary; +import com.android.settings.gestures.GestureNavigationSettingsFragment; +import com.android.settings.gestures.SystemNavigationGestureSettings; import com.android.settings.location.LocationSettings; import com.android.settings.location.RecentLocationRequestSeeAllFragment; import com.android.settings.network.NetworkDashboardFragment; @@ -63,5 +65,7 @@ public class CustomSiteMapRegistry { SystemDashboardFragment.class.getName()); CUSTOM_SITE_MAP.put(ZenModeBlockedEffectsSettings.class.getName(), ZenModeRestrictNotificationsSettings.class.getName()); + CUSTOM_SITE_MAP.put(GestureNavigationSettingsFragment.class.getName(), + SystemNavigationGestureSettings.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 a3e88d96ca3..20f0716aa2e 100644 --- a/tests/robotests/src/com/android/settings/search/CustomSiteMapRegistryTest.java +++ b/tests/robotests/src/com/android/settings/search/CustomSiteMapRegistryTest.java @@ -24,6 +24,8 @@ import com.android.settings.connecteddevice.ConnectedDeviceDashboardFragment; import com.android.settings.connecteddevice.usb.UsbDetailsFragment; import com.android.settings.fuelgauge.PowerUsageAdvanced; import com.android.settings.fuelgauge.PowerUsageSummary; +import com.android.settings.gestures.GestureNavigationSettingsFragment; +import com.android.settings.gestures.SystemNavigationGestureSettings; import com.android.settings.location.LocationSettings; import com.android.settings.location.RecentLocationRequestSeeAllFragment; import com.android.settings.network.NetworkDashboardFragment; @@ -94,4 +96,11 @@ public class CustomSiteMapRegistryTest { ZenModeBlockedEffectsSettings.class.getName())).isEqualTo( ZenModeRestrictNotificationsSettings.class.getName()); } + + @Test + public void shouldContainGestureNavigationSettingsFragmentPairs() { + assertThat(CustomSiteMapRegistry.CUSTOM_SITE_MAP.get( + GestureNavigationSettingsFragment.class.getName())).isEqualTo( + SystemNavigationGestureSettings.class.getName()); + } }