diff --git a/src/com/android/settings/datetime/LocationTimeZoneDetectionPreferenceController.java b/src/com/android/settings/datetime/LocationTimeZoneDetectionPreferenceController.java index cb39635cc43..e25422f8db1 100644 --- a/src/com/android/settings/datetime/LocationTimeZoneDetectionPreferenceController.java +++ b/src/com/android/settings/datetime/LocationTimeZoneDetectionPreferenceController.java @@ -109,6 +109,14 @@ public class LocationTimeZoneDetectionPreferenceController mTimeManager.removeTimeZoneDetectorListener(this); } + @Override + public boolean isSliceable() { + // Prevent use in a slice, which would enable search to display a toggle in the search + // results: LocationToggleDisabledDialogFragment has to be shown under some circumstances + // which doesn't work when embedded in search. b/185906072 + return false; + } + @Override public int getAvailabilityStatus() { TimeZoneCapabilities timeZoneCapabilities = diff --git a/tests/robotests/src/com/android/settings/datetime/LocationTimeZoneDetectionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/LocationTimeZoneDetectionPreferenceControllerTest.java index 1262b5045a7..b9c4edc9af2 100644 --- a/tests/robotests/src/com/android/settings/datetime/LocationTimeZoneDetectionPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/datetime/LocationTimeZoneDetectionPreferenceControllerTest.java @@ -86,6 +86,11 @@ public class LocationTimeZoneDetectionPreferenceControllerTest { verify(mTimeManager).updateTimeZoneConfiguration(expectedConfiguration); } + @Test + public void isNotSliceable() { + assertThat(mController.isSliceable()).isFalse(); + } + @Test public void setChecked_withTrue_shouldDoNothing_whenLocationIsDisabled() { when(mLocationManager.isLocationEnabled()).thenReturn(false);