| commit | 6be940f396e22abc5f93c4652e9eee17c8f28803 | [log] [tgz] |
|---|---|---|
| author | Almaz Mingaleev <mingaleev@google.com> | Fri Apr 23 08:53:18 2021 +0000 |
| committer | Almaz Mingaleev <mingaleev@google.com> | Fri Apr 23 10:29:58 2021 +0000 |
| tree | 34a274480d87f3739d2f4dd6d4f4ca0ea5029401 | |
| parent | ea7b64a96db64e6f6f955a087b5cd7bbec255d78 [diff] |
Do not show toggle for location tz detection in search. It also makes setting in line with "Set time zone automatically", which is rendered w/o toggle on search page. Bug: 185906072 Test: manually verified that toggle is not shown Test: m -j30 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.datetime.LocationTimeZoneDetectionPreferenceControllerTest" Change-Id: Ie71572c4a9b9bd6adf3660556363331e2943fd5b
diff --git a/src/com/android/settings/datetime/LocationTimeZoneDetectionPreferenceController.java b/src/com/android/settings/datetime/LocationTimeZoneDetectionPreferenceController.java index cb39635..e25422f 100644 --- a/src/com/android/settings/datetime/LocationTimeZoneDetectionPreferenceController.java +++ b/src/com/android/settings/datetime/LocationTimeZoneDetectionPreferenceController.java
@@ -110,6 +110,14 @@ } @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 = getTimeZoneCapabilitiesAndConfig(/* forceRefresh= */ false).getCapabilities();
diff --git a/tests/robotests/src/com/android/settings/datetime/LocationTimeZoneDetectionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/LocationTimeZoneDetectionPreferenceControllerTest.java index 1262b50..b9c4edc 100644 --- a/tests/robotests/src/com/android/settings/datetime/LocationTimeZoneDetectionPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/datetime/LocationTimeZoneDetectionPreferenceControllerTest.java
@@ -87,6 +87,11 @@ } @Test + public void isNotSliceable() { + assertThat(mController.isSliceable()).isFalse(); + } + + @Test public void setChecked_withTrue_shouldDoNothing_whenLocationIsDisabled() { when(mLocationManager.isLocationEnabled()).thenReturn(false);