Index: components/policy/resources/policy_templates.json |
diff --git a/components/policy/resources/policy_templates.json b/components/policy/resources/policy_templates.json |
index 28d3c99f8ed01a249943ef9d8365f8cfc9b8bdba..f9fb7e7d81e2ea08ed1a2548fa7ccb3d272370aa 100644 |
--- a/components/policy/resources/policy_templates.json |
+++ b/components/policy/resources/policy_templates.json |
@@ -139,7 +139,7 @@ |
# persistent IDs for all fields (but not for groups!) are needed. These are |
# specified by the 'id' keys of each policy. NEVER CHANGE EXISTING IDs, |
# because doing so would break the deployed wire format! |
-# For your editing convenience: highest ID currently used: 360 |
+# For your editing convenience: highest ID currently used: 362 |
# And don't forget to also update the EnterprisePolicies enum of |
# histograms.xml. |
# |
@@ -9448,6 +9448,52 @@ |
If the device wallpaper policy is left not set, it's the user's wallpaper policy to decide what to show if the user's wallpaper policy is set.''', |
}, |
+ { |
+ 'name': 'DeviceLoginScreenLocales', |
+ 'type': 'list', |
+ 'schema': { |
+ 'type': 'array', |
+ 'items': { 'type': 'string' }, |
+ }, |
+ 'supported_on': ['chrome_os:58-'], |
+ 'device_only': True, |
+ 'features': { |
+ 'dynamic_refresh': False, |
+ }, |
+ 'example_value': [ "en-US" ], |
+ 'max_size': 16777216, |
+ 'id': 361, |
+ 'caption': '''Device sign-in screen locale''', |
+ 'tags': [], |
+ 'desc': '''Configures the locale which is enforced on the Chrome OS sign-in screen. |
pastarmovj
2017/01/26 20:13:16
I know this is very inconsistent right now but sti
pmarko
2017/01/27 08:52:18
Done.
I've actually left the placeholder only in t
|
+ |
+ If this policy is set, the Chrome OS sign-in screen will always be displayed in the locale which is given by the first value of this policy (the policy is defined as a list for forward compatibility). |
pastarmovj
2017/01/26 20:13:16
Leave an empty line between paragraphs.
pmarko
2017/01/27 08:52:18
Done. (merged last 3 paragraphs into one)
|
+ If this policy is not set or is set to an empty list, the Chrome OS sign-in screen will be displayed in the locale of the last user session. |
+ If this policy is set to a value which is not a valid locale, the Chrome OS sign-in screen will be displayed in a fallback locale (currently, en-US).''' |
+ }, |
+ { |
+ 'name': 'DeviceLoginScreenInputMethods', |
+ 'type': 'list', |
+ 'schema': { |
+ 'type': 'array', |
+ 'items': { 'type': 'string' }, |
+ }, |
+ 'supported_on': ['chrome_os:58-'], |
+ 'device_only': True, |
+ 'features': { |
+ 'dynamic_refresh': True, |
+ }, |
+ 'example_value': [ "xkb:us::en", "xkb:ch::ger" ], |
+ 'max_size': 16777216, |
+ 'id': 362, |
+ 'caption': '''Device sign-in screen keyboard layouts''', |
+ 'tags': [], |
+ 'desc': '''Configures which keyboard layouts are allowed on the Chrome OS sign-in screen. |
+ |
+ If this policy is set to a list of input method identifiers, the given input methods will be available on the Chrome OS sign-in screen. The first given input method will be preselected. While a user pod is focused on the Chrome OS sign-in screen, the user's least recently used input method will be available in addition to the input methods given by this policy. |
+ If this policy is not set, the input methods on the Chrome OS sign-in screen will be derived from the locale in which the sign-in screen is displayed. |
+ Values which are not valid input method identifiers will be ignored.''', |
+ }, |
], |
'messages': { |
# Messages that are not associated to any policies. |