Merge "Changes to location settings for geotz" (c91bcbd0) · Commits · e / os / android_packages_apps_Settings

res/values/strings.xml

+26 −0

Original line number	Diff line number	Diff line
		@@ -4002,6 +4002,32 @@
		<!-- [CHAR LIMIT=50] Location settings screen, sub category for location services for managed profile -->
		<string name="managed_profile_location_services">Location services for work</string>

		<!-- [CHAR LIMIT=60] Location settings screen, screen title -->
		<string name="location_time_zone_detection_screen_title">Location time zone detection</string>
		<!-- [CHAR LIMIT=50] Location settings screen, title for the setting that control whether the
		device can use its location for time zone detection. -->
		<string name="location_time_zone_detection_enabled_title">Location time zone detection</string>
		<!-- [CHAR LIMIT=NONE] Preference description text for location time zone detection -->
		<string name="location_time_zone_detection_enabled_description">Allows the device\u2019s location to be used to detect the current time zone. Other location settings such as Wi\u2011Fi scanning can affect the accuracy of time zone detection.</string>

		<!-- [CHAR LIMIT=NONE] Location settings screen, summary when location time zone detection is on -->
		<string name="location_time_zone_detection_on">On</string>
		<!-- [CHAR LIMIT=NONE] Location settings screen, summary when location time zone detection is off -->
		<string name="location_time_zone_detection_off">Off</string>
		<!-- [CHAR LIMIT=NONE] Location settings screen, summary when location time zone detection is not
		applicable due to other settings like the "automatic time zone detection enabled" setting
		being set to "off". -->
		<string name="location_time_zone_detection_auto_is_off">Automatic time zone detection is disabled</string>
		<!-- [CHAR LIMIT=NONE] Location settings screen, summary when location time zone detection is not
		applicable for the user for unspecified reasons. More specific messages are used when there
		is a clear reason. -->
		<string name="location_time_zone_detection_not_applicable">Location time zone detection is disabled</string>
		<!-- [CHAR LIMIT=NONE] Location settings screen, summary when location time zone detection is not supported -->
		<string name="location_time_zone_detection_not_supported">Location time zone detection is not supported</string>
		<!-- [CHAR LIMIT=NONE] Location settings screen, summary when location time zone detection is not
		allowed for the user, e.g. because of device policy -->
		<string name="location_time_zone_detection_not_allowed">Location time zone detection changes are not allowed</string>

		<!-- [CHAR LIMIT=30] Security & location settings screen, setting check box label for Google location service (cell ID, wifi, etc.) -->
		<string name="location_network_based">Wi\u2011Fi & mobile network location</string>
		<!-- [CHAR LIMIT=130] Security & location settings screen, setting summary for Google location service check box-->

res/xml/location_settings.xml

+7 −0

Original line number	Diff line number	Diff line
		@@ -65,6 +65,13 @@
		settings:forWork="true"
		settings:useAdminDisabledSummary="true"/>

		<!-- This preference gets removed if location-based time zone detection is not supported -->
		<Preference
		android:key="location_time_zone_detection"
		android:title="@string/location_time_zone_detection_screen_title"
		settings:controller="com.android.settings.location.LocationTimeZoneDetectionPreferenceController"
		android:fragment="com.android.settings.location.TimeZoneDetectionSettings" />

		<PreferenceCategory
		android:key="location_services"
		android:layout="@layout/preference_category_no_label"

res/xml/location_settings_personal.xml

+7 −0

Original line number	Diff line number	Diff line
		@@ -51,6 +51,13 @@
		android:fragment="com.android.settings.location.ScanningSettings"
		settings:controller="com.android.settings.location.LocationScanningPreferenceController"/>

		<!-- This preference gets removed if location-based time zone detection is not supported -->
		<Preference
		android:key="location_time_zone_detection"
		android:title="@string/location_time_zone_detection_screen_title"
		settings:controller="com.android.settings.location.LocationTimeZoneDetectionPreferenceController"
		android:fragment="com.android.settings.location.TimeZoneDetectionSettings" />

		<PreferenceCategory
		android:key="location_services"
		android:layout="@layout/preference_category_no_label"

res/xml/location_time_zone_detection.xml

0 → 100644

+25 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!-- Copyright (C) 2020 The Android Open Source Project

		Licensed under the Apache License, Version 2.0 (the "License");
		you may not use this file except in compliance with the License.
		You may obtain a copy of the License at

		http://www.apache.org/licenses/LICENSE-2.0

		Unless required by applicable law or agreed to in writing, software
		distributed under the License is distributed on an "AS IS" BASIS,
		WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		See the License for the specific language governing permissions and
		limitations under the License.
		-->

		<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
		android:title="@string/location_time_zone_detection_screen_title">

		<SwitchPreference
		android:title="@string/location_time_zone_detection_enabled_title"
		android:summary="@string/location_time_zone_detection_enabled_description"
		android:key="location_time_zone_detection_enabled" />

		</PreferenceScreen>

src/com/android/settings/location/LocationPersonalSettings.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -58,6 +58,8 @@ public class LocationPersonalSettings extends DashboardFragment {
		RecentLocationRequestPreferenceController.class);
		controller.init(this);
		controller.setProfileType(profileType);

		use(LocationTimeZoneDetectionPreferenceController.class);
		}

		@Override