PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix breadcrumb of search results provided by Settings" into rvc-dev am: d2291d447e am: 6bb86dc6ea am: 832fa03fa3

Browse Source 
Change-Id: I8c8c9a76c60367a4d293466dd386c5114c1322e8
This commit is contained in:
TreeHugger Robot
2020-04-22 05:55:50 +00:00
committed by Automerger Merge Worker
parent 9f464a6037 832fa03fa3
commit c75250a1ff
2 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/search/CustomSiteMapRegistry.java
View File

@@ -24,6 +24,8 @@ import com.android.settings.connecteddevice.ConnectedDeviceDashboardFragment;
import com.android.settings.connecteddevice.usb.UsbDetailsFragment; import com.android.settings.connecteddevice.usb.UsbDetailsFragment;
import com.android.settings.fuelgauge.PowerUsageAdvanced; import com.android.settings.fuelgauge.PowerUsageAdvanced;
import com.android.settings.fuelgauge.PowerUsageSummary; 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.LocationSettings;
import com.android.settings.location.RecentLocationRequestSeeAllFragment; import com.android.settings.location.RecentLocationRequestSeeAllFragment;
import com.android.settings.network.NetworkDashboardFragment; import com.android.settings.network.NetworkDashboardFragment;
@@ -63,5 +65,7 @@ public class CustomSiteMapRegistry {
SystemDashboardFragment.class.getName()); SystemDashboardFragment.class.getName());
CUSTOM_SITE_MAP.put(ZenModeBlockedEffectsSettings.class.getName(), CUSTOM_SITE_MAP.put(ZenModeBlockedEffectsSettings.class.getName(),
ZenModeRestrictNotificationsSettings.class.getName()); ZenModeRestrictNotificationsSettings.class.getName());
CUSTOM_SITE_MAP.put(GestureNavigationSettingsFragment.class.getName(),
SystemNavigationGestureSettings.class.getName());
} }
} }

9
tests/robotests/src/com/android/settings/search/CustomSiteMapRegistryTest.java
View File

@@ -24,6 +24,8 @@ import com.android.settings.connecteddevice.ConnectedDeviceDashboardFragment;
import com.android.settings.connecteddevice.usb.UsbDetailsFragment; import com.android.settings.connecteddevice.usb.UsbDetailsFragment;
import com.android.settings.fuelgauge.PowerUsageAdvanced; import com.android.settings.fuelgauge.PowerUsageAdvanced;
import com.android.settings.fuelgauge.PowerUsageSummary; 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.LocationSettings;
import com.android.settings.location.RecentLocationRequestSeeAllFragment; import com.android.settings.location.RecentLocationRequestSeeAllFragment;
import com.android.settings.network.NetworkDashboardFragment; import com.android.settings.network.NetworkDashboardFragment;
@@ -94,4 +96,11 @@ public class CustomSiteMapRegistryTest {
ZenModeBlockedEffectsSettings.class.getName())).isEqualTo( ZenModeBlockedEffectsSettings.class.getName())).isEqualTo(
ZenModeRestrictNotificationsSettings.class.getName()); ZenModeRestrictNotificationsSettings.class.getName());
} }
@Test
public void shouldContainGestureNavigationSettingsFragmentPairs() {
assertThat(CustomSiteMapRegistry.CUSTOM_SITE_MAP.get(
GestureNavigationSettingsFragment.class.getName())).isEqualTo(
SystemNavigationGestureSettings.class.getName());
}
} }