From 218404394fdcfe3a4676cc411c10d752e820a439 Mon Sep 17 00:00:00 2001 From: Neil Fuller Date: Mon, 9 Nov 2020 20:44:27 +0000 Subject: [PATCH] Move the Location time zone detection setting Move the Location time zone detection setting to Date & Time as per UI review / product request. This initial commit just moves the existing MVP setting behavior to a different screen. Still invisible by default. Enable with: $ adb shell setprop persist.sys.location_time_zone_detection_feature_enabled 1 .. plus a reboot. Bug: 152746236 Test: Manual: build / boot / toggle switch in SettingsUI / inspect output of adb shell dumpsys time_zone_detector Test: m -j30 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.datetime.LocationTimeZoneDetectionPreferenceControllerTest" Test: m -j30 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.datetime.locationtimezone.TimeZoneDetectionTogglePreferenceControllerTest" Test: m -j30 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.datetime.locationtimezone.TimeZoneDetectionSettingsTest" Change-Id: I9ecfa853014a9f92086a9cb2d34e1517474ceb93 --- res/xml/date_time_prefs.xml | 8 ++++++++ res/xml/location_settings.xml | 7 ------- res/xml/location_settings_personal.xml | 7 ------- res/xml/location_time_zone_detection.xml | 2 +- .../LocationTimeZoneDetectionPreferenceController.java | 2 +- .../locationtimezone}/TimeZoneDetectionSettings.java | 2 +- .../TimeZoneDetectionTogglePreferenceController.java | 2 +- ...LocationTimeZoneDetectionPreferenceControllerTest.java | 2 +- .../locationtimezone}/TimeZoneDetectionSettingsTest.java | 2 +- .../TimeZoneDetectionTogglePreferenceControllerTest.java | 2 +- 10 files changed, 15 insertions(+), 21 deletions(-) rename src/com/android/settings/{location => datetime}/LocationTimeZoneDetectionPreferenceController.java (99%) rename src/com/android/settings/{location => datetime/locationtimezone}/TimeZoneDetectionSettings.java (96%) rename src/com/android/settings/{location => datetime/locationtimezone}/TimeZoneDetectionTogglePreferenceController.java (97%) rename tests/robotests/src/com/android/settings/{location => datetime}/LocationTimeZoneDetectionPreferenceControllerTest.java (99%) rename tests/robotests/src/com/android/settings/{location => datetime/locationtimezone}/TimeZoneDetectionSettingsTest.java (96%) rename tests/robotests/src/com/android/settings/{location => datetime/locationtimezone}/TimeZoneDetectionTogglePreferenceControllerTest.java (98%) diff --git a/res/xml/date_time_prefs.xml b/res/xml/date_time_prefs.xml index 20fac4547fa..43a797a4b0c 100644 --- a/res/xml/date_time_prefs.xml +++ b/res/xml/date_time_prefs.xml @@ -52,6 +52,14 @@ settings:userRestriction="no_config_date_time" settings:keywords="@string/keywords_time_zone"/> + + + - - - - - - diff --git a/src/com/android/settings/location/LocationTimeZoneDetectionPreferenceController.java b/src/com/android/settings/datetime/LocationTimeZoneDetectionPreferenceController.java similarity index 99% rename from src/com/android/settings/location/LocationTimeZoneDetectionPreferenceController.java rename to src/com/android/settings/datetime/LocationTimeZoneDetectionPreferenceController.java index a16c9bbd792..bbfbb193e17 100644 --- a/src/com/android/settings/location/LocationTimeZoneDetectionPreferenceController.java +++ b/src/com/android/settings/datetime/LocationTimeZoneDetectionPreferenceController.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.settings.location; +package com.android.settings.datetime; import static android.app.time.TimeZoneCapabilities.CAPABILITY_NOT_ALLOWED; import static android.app.time.TimeZoneCapabilities.CAPABILITY_NOT_APPLICABLE; diff --git a/src/com/android/settings/location/TimeZoneDetectionSettings.java b/src/com/android/settings/datetime/locationtimezone/TimeZoneDetectionSettings.java similarity index 96% rename from src/com/android/settings/location/TimeZoneDetectionSettings.java rename to src/com/android/settings/datetime/locationtimezone/TimeZoneDetectionSettings.java index 66e2f9a4802..db6ffc40e33 100644 --- a/src/com/android/settings/location/TimeZoneDetectionSettings.java +++ b/src/com/android/settings/datetime/locationtimezone/TimeZoneDetectionSettings.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.settings.location; +package com.android.settings.datetime.locationtimezone; import android.app.settings.SettingsEnums; diff --git a/src/com/android/settings/location/TimeZoneDetectionTogglePreferenceController.java b/src/com/android/settings/datetime/locationtimezone/TimeZoneDetectionTogglePreferenceController.java similarity index 97% rename from src/com/android/settings/location/TimeZoneDetectionTogglePreferenceController.java rename to src/com/android/settings/datetime/locationtimezone/TimeZoneDetectionTogglePreferenceController.java index f23c9f9addf..c91be7f1ed5 100644 --- a/src/com/android/settings/location/TimeZoneDetectionTogglePreferenceController.java +++ b/src/com/android/settings/datetime/locationtimezone/TimeZoneDetectionTogglePreferenceController.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.settings.location; +package com.android.settings.datetime.locationtimezone; import android.app.time.TimeManager; import android.app.time.TimeZoneCapabilitiesAndConfig; diff --git a/tests/robotests/src/com/android/settings/location/LocationTimeZoneDetectionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/LocationTimeZoneDetectionPreferenceControllerTest.java similarity index 99% rename from tests/robotests/src/com/android/settings/location/LocationTimeZoneDetectionPreferenceControllerTest.java rename to tests/robotests/src/com/android/settings/datetime/LocationTimeZoneDetectionPreferenceControllerTest.java index 03e684b6aa3..07588691b00 100644 --- a/tests/robotests/src/com/android/settings/location/LocationTimeZoneDetectionPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/datetime/LocationTimeZoneDetectionPreferenceControllerTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.settings.location; +package com.android.settings.datetime; import static android.app.time.TimeZoneCapabilities.CAPABILITY_NOT_APPLICABLE; import static android.app.time.TimeZoneCapabilities.CAPABILITY_NOT_SUPPORTED; diff --git a/tests/robotests/src/com/android/settings/location/TimeZoneDetectionSettingsTest.java b/tests/robotests/src/com/android/settings/datetime/locationtimezone/TimeZoneDetectionSettingsTest.java similarity index 96% rename from tests/robotests/src/com/android/settings/location/TimeZoneDetectionSettingsTest.java rename to tests/robotests/src/com/android/settings/datetime/locationtimezone/TimeZoneDetectionSettingsTest.java index a8104bd73b4..9f164924133 100644 --- a/tests/robotests/src/com/android/settings/location/TimeZoneDetectionSettingsTest.java +++ b/tests/robotests/src/com/android/settings/datetime/locationtimezone/TimeZoneDetectionSettingsTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.settings.location; +package com.android.settings.datetime.locationtimezone; import static com.google.common.truth.Truth.assertThat; diff --git a/tests/robotests/src/com/android/settings/location/TimeZoneDetectionTogglePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/locationtimezone/TimeZoneDetectionTogglePreferenceControllerTest.java similarity index 98% rename from tests/robotests/src/com/android/settings/location/TimeZoneDetectionTogglePreferenceControllerTest.java rename to tests/robotests/src/com/android/settings/datetime/locationtimezone/TimeZoneDetectionTogglePreferenceControllerTest.java index a78499c7cc8..27a985962a3 100644 --- a/tests/robotests/src/com/android/settings/location/TimeZoneDetectionTogglePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/datetime/locationtimezone/TimeZoneDetectionTogglePreferenceControllerTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.settings.location; +package com.android.settings.datetime.locationtimezone; import static android.app.time.TimeZoneCapabilities.CAPABILITY_NOT_APPLICABLE; import static android.app.time.TimeZoneCapabilities.CAPABILITY_POSSESSED;