Index: components/policy/resources/policy_templates.json |
diff --git a/components/policy/resources/policy_templates.json b/components/policy/resources/policy_templates.json |
index 2eb824f8e2ef75652906ab1d40f8ab87c81e54f2..1403c5700418566ef6f6c9f5455eb0ef077139ab 100644 |
--- a/components/policy/resources/policy_templates.json |
+++ b/components/policy/resources/policy_templates.json |
@@ -5737,7 +5737,9 @@ |
New devices start out with the timezone set to "US/Pacific". |
- The format of the value follows the names of timezones in the "IANA Time Zone Database" (see "https://en.wikipedia.org/wiki/Tz_database"). In particular, most timezones can be referred to by "continent/large_city" or "ocean/large_city".''', |
+ The format of the value follows the names of timezones in the "IANA Time Zone Database" (see "https://en.wikipedia.org/wiki/Tz_database"). In particular, most timezones can be referred to by "continent/large_city" or "ocean/large_city". |
+ |
+ Setting this policy completely disables automatic timezone resolve by device location. It also overrides SystemTimezoneAutomaticDetection policy.''', |
}, |
{ |
'name': 'SystemUse24HourClock', |
@@ -8374,6 +8376,58 @@ |
'tags': ['system-security'], |
'id': 324, |
}, |
+ { |
+ 'name': 'SystemTimezoneAutomaticDetection', |
+ 'type': 'int-enum', |
+ 'schema': { |
+ 'type': 'integer', |
+ 'enum': [ 0, 1, 2, 3 ], |
+ }, |
+ 'items': [ |
+ { |
+ 'name': 'AUTOMATIC_TIMEZONE_DETECTION_USERS_DECIDE', |
+ 'value': 0, |
+ 'caption': '''Let users decide.''', |
+ }, |
+ { |
+ 'name': 'AUTOMATIC_TIMEZONE_DETECTION_DISABLED', |
+ 'value': 1, |
+ 'caption': '''Never auto-detect timezone.''', |
+ }, |
+ { |
+ 'name': 'AUTOMATIC_TIMEZONE_DETECTION_IP_ONLY', |
+ 'value': 2, |
+ 'caption': '''Always use coarse timezone detection.''', |
+ }, |
+ { |
+ 'name': 'AUTOMATIC_TIMEZONE_DETECTION_SEND_WIFI_ACCESS_POINTS', |
+ 'value': 3, |
+ 'caption': '''Always send WiFi acess-points to server.use fine-grained timezone detection (send curently visible WiFi access points to Geolocation API to better locate geographical position).''', |
bartfab (slow)
2016/04/01 14:44:50
Nit 1: s/server.use/server and use/
Nit 2: These c
Alexander Alekseev
2016/04/01 23:59:33
Done.
|
+ }, |
+ ], |
+ 'supported_on': ['chrome_os:51-'], |
+ 'device_only': True, |
+ 'features': { |
+ 'dynamic_refresh': True, |
+ }, |
+ 'example_value': 0, |
+ 'id': 325, |
+ 'caption': '''Configure the automatic timezone detection method''', |
+ 'tags': [], |
bartfab (slow)
2016/04/01 14:44:50
This should be tagged with "google-sharing" as AUT
Alexander Alekseev
2016/04/01 23:59:33
Done.
|
+ 'desc': '''When this policy is set, automatic timezone detection flow will be in one of the following ways depending on the value of the setting: |
+ |
+ If set to AUTOMATIC_TIMEZONE_DETECTION_USERS_DECIDE, users would be able to control automatic timezone detection using normal controls in chrome://settings. |
+ |
+ If set to AUTOMATIC_TIMEZONE_DETECTION_DISABLED, automatic timezone controls in chrome://settings will be disabled. Automatic timezone detection will be always off. Timezone could be controlled either by SystemTimezone policy or by timezone selector in chrome://settings. |
bartfab (slow)
2016/04/01 14:44:50
"Timezone could be controlled either by SystemTime
Alexander Alekseev
2016/04/01 23:59:33
Done.
|
+ |
+ If set to AUTOMATIC_TIMEZONE_DETECTION_IP_ONLY, timezone controls in chrome://settings will be disabled. Automatic timezone detection will be always on. Timezone detection will use IP-only method to resolve location. |
+ |
+ If set to AUTOMATIC_TIMEZONE_DETECTION_SEND_WIFI_ACCESS_POINTS, timezone controls in chrome://settings will be disabled. Automatic timezone detection will be always on. The list of visible WiFi access-points will be always sent to Geolocation API server for fine-grained timezone detection. |
+ |
+ If this policy is not set, it will behave as if AUTOMATIC_TIMEZONE_DETECTION_USERS_DECIDE is set. |
+ |
+ If SystemTimezone policy is set. it overrides this policy. In this case automatic timezone detection is completely disabled.''', |
bartfab (slow)
2016/04/01 14:44:50
Nit: s/set./set,/
Alexander Alekseev
2016/04/01 23:59:33
Done.
|
+ }, |
], |
'messages': { |
# Messages that are not associated to any policies. |