Index: components/policy/resources/policy_templates.json |
diff --git a/components/policy/resources/policy_templates.json b/components/policy/resources/policy_templates.json |
index ecdaa1534fac612f622093066521653b2cc72002..4453df38eed9ff688ff53396ccb21f9ba6962e2f 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: 353 |
+# For your editing convenience: highest ID currently used: 356 |
# |
# Placeholders: |
# The following placeholder strings are automatically substituted: |
@@ -9201,78 +9201,143 @@ |
configuration of printers by individual users.''', |
}, |
{ |
- 'name': 'QuickUnlockModeWhitelist', |
- 'type': 'list', |
- 'schema': { |
- 'type': 'array', |
- 'items': { |
- 'type': 'string', |
- 'enum': [ |
- 'all', |
- 'PIN' |
- ], |
- }, |
- 'id': 'QuickUnlockModeWhitelist', |
- }, |
- 'supported_on': ['chrome_os:56-'], |
- 'features': { |
- 'dynamic_refresh': True, |
- 'per_profile': True, |
- }, |
- 'example_value': ['PIN'], |
- 'id': 352, |
- 'caption': '''Configure allowed quick unlock modes.''', |
- 'tags': [], |
- 'desc': '''Controls which quick unlock modes are allowed to be set up and used. |
- This setting white-lists the allowed quick unlock modes that can be set up and used to unlock the lock screen. The value is a list of strings, each of which should be one of the following: "all", "PIN". If "all" is selected, then all supported quick modes will be available, otherwise the modes in the list will be the ones available. |
+ 'name': 'QuickUnlock', |
+ 'type': 'group', |
+ 'caption': '''Quick unlock policies''', |
+ 'desc': '''Configures quick unlock related policies.''', |
+ 'policies': [ |
+ { |
+ 'name': 'QuickUnlockModeWhitelist', |
+ 'type': 'list', |
+ 'schema': { |
+ 'type': 'array', |
+ 'items': { |
+ 'type': 'string', |
+ 'enum': [ |
+ 'all', |
+ 'PIN' |
+ ], |
+ }, |
+ 'id': 'QuickUnlockModeWhitelist', |
+ }, |
+ 'supported_on': ['chrome_os:56-'], |
+ 'features': { |
+ 'dynamic_refresh': True, |
+ 'per_profile': True, |
+ }, |
+ 'example_value': ['PIN'], |
+ 'id': 352, |
+ 'caption': '''Configure allowed quick unlock modes.''', |
+ 'tags': [], |
+ 'desc': '''Controls which quick unlock modes are allowed to be set up and used. |
+ This setting white-lists the allowed quick unlock modes that can be set up and used to unlock the lock screen. The value is a list of strings, each of which should be one of the following: "all", "PIN". If "all" is selected, then all supported quick modes will be available, otherwise the modes in the list will be the ones available. |
- If this setting is configured, quick unlock modes which have a type that is not on this list can not be set up or used. |
+ If this setting is configured, quick unlock modes which have a type that is not on this list can not be set up or used. |
- If this setting is left not configured, "PIN" mode will be enabled, and all other modes will be disabled.''', |
- }, |
- { |
- 'name': 'QuickUnlockTimeout', |
- 'type': 'int-enum', |
- 'schema': { |
- 'type': 'integer', |
- 'enum': [ 0, 1, 2, 3 ], |
- }, |
- 'items': [ |
+ If this setting is left not configured, "PIN" mode will be enabled, and all other modes will be disabled.''', |
+ }, |
{ |
- 'name': 'SixHours', |
- 'value': 0, |
- 'caption': '''Password entry is required every six hours.''', |
+ 'name': 'QuickUnlockTimeout', |
+ 'type': 'int-enum', |
+ 'schema': { |
+ 'type': 'integer', |
+ 'enum': [ 0, 1, 2, 3 ], |
+ }, |
+ 'items': [ |
+ { |
+ 'name': 'SixHours', |
+ 'value': 0, |
+ 'caption': '''Password entry is required every six hours.''', |
+ }, |
+ { |
+ 'name': 'TweleveHours', |
+ 'value': 1, |
+ 'caption': '''Password entry is required every twelve hours.''', |
+ }, |
+ { |
+ 'name': 'Day', |
+ 'value': 2, |
+ 'caption': '''Password entry is required every day (24 hours).''', |
+ }, |
+ { |
+ 'name': 'Week', |
+ 'value': 3, |
+ 'caption': '''Password entry is required every week (168 hours).''', |
+ }, |
+ ], |
+ 'supported_on': ['chrome_os:56-'], |
pastarmovj
2016/12/08 09:02:19
nit: please bump up to 57 unless you are planning
sammiequon
2016/12/08 21:51:07
Done.
|
+ 'features': { |
+ 'dynamic_refresh': True, |
+ 'per_profile': True, |
+ }, |
+ 'example_value': 2, |
+ 'id': 353, |
+ 'caption': '''Sets how often user has to enter password to use quick unlock.''', |
+ 'tags': [], |
+ 'desc': '''This setting controls how often the lock screen will request the password to be entered in order to continue using quick unlock. Each time the lock screen is entered, if the last password entry was more than this setting, the quick unlock will not be available on entering the lock screen. Should the user stay on the lock screen past this period of time, a password will be requested next time the user enters the wrong code, or re-enters the lock screen, whichever comes first. |
+ |
+ If this setting is configured, users using quick unlock will be requested to enter their passwords on the lock screen depending on this setting. |
+ |
+ If this setting is not configured, users using quick unlock will be requested to enter their password on the lock screen every day.''', |
}, |
{ |
- 'name': 'TweleveHours', |
- 'value': 1, |
- 'caption': '''Password entry is required every twelve hours.''', |
+ 'name': 'PinUnlockMinimumLength', |
+ 'type': 'int', |
+ 'schema': { 'type': 'integer' }, |
+ 'supported_on': ['chrome_os:56-'], |
pastarmovj
2016/12/08 09:02:19
nit:ditto.
sammiequon
2016/12/08 21:51:07
Done.
|
+ 'features': { |
+ 'dynamic_refresh': True, |
+ 'per_profile': False, |
pastarmovj
2016/12/08 09:02:19
Just a question here. Why are these policies below
sammiequon
2016/12/08 21:51:07
That is a mistake they should all be true. Done.
|
+ }, |
+ 'example_value': 4, |
+ 'id': 354, |
+ 'caption': '''Sets the minimum length of the lock screen PIN.''', |
+ 'tags': [], |
+ 'desc': '''This setting controls the minimum length a PIN can be. |
+ |
+ If this setting is configured to be less than 1, the minimum length a PIN can be is 1. |
+ |
+ If this setting is not configured, the minimum length a PIN can be is 4.''', |
}, |
{ |
- 'name': 'Day', |
- 'value': 2, |
- 'caption': '''Password entry is required every day (24 hours).''', |
+ 'name': 'PinUnlockMaximumLength', |
+ 'type': 'int', |
+ 'schema': { 'type': 'integer' }, |
+ 'supported_on': ['chrome_os:56-'], |
pastarmovj
2016/12/08 09:02:19
nit:ditto.
sammiequon
2016/12/08 21:51:07
Done.
|
+ 'features': { |
+ 'dynamic_refresh': True, |
+ 'per_profile': False, |
+ }, |
+ 'example_value': 0, |
+ 'id': 355, |
+ 'caption': '''Sets the maximum length of the lock screen PIN.''', |
+ 'tags': [], |
+ 'desc': '''This setting controls the maximum length a PIN can be. |
+ |
+ If this setting is configured to be 0 or less, there is no maximum length and a user can set a PIN as long as they want. |
+ |
+ If this setting is less than PinUnlockMinimumLength but greater than 0, the maximum length is the same as the minimum length. |
+ |
+ If this setting is not configured, there is no maximum length and a user can set a PIN as long as they want.''', |
}, |
{ |
- 'name': 'Week', |
- 'value': 3, |
- 'caption': '''Password entry is required every week (168 hours).''', |
+ 'name': 'PinUnlockWeakPinsAllowed', |
+ 'type': 'main', |
+ 'schema': { 'type': 'boolean' }, |
+ 'supported_on': ['chrome_os:56-'], |
pastarmovj
2016/12/08 09:02:19
nit: ditto.
sammiequon
2016/12/08 21:51:07
Done.
|
+ 'features': { |
+ 'dynamic_refresh': True, |
+ 'per_profile': False, |
+ }, |
+ 'example_value': False, |
+ 'id': 356, |
+ 'caption': '''Enables users to set weak PINs for the lock screen PIN.''', |
+ 'tags': [], |
+ 'desc': '''If this setting is configured to be false, users will be prevented from setting PINs that are considered weak. Such PINs include PINs which contain the same digit throughout, PINs whose digits are increasing by 1, PINs whose digits are decreasing by 1 and PINs which are too common. |
+ |
+ If this setting is configured to be true, or not configured, users can enter these PINs and will only get a warning display.''', |
}, |
], |
- 'supported_on': ['chrome_os:56-'], |
- 'features': { |
- 'dynamic_refresh': True, |
- 'per_profile': True, |
- }, |
- 'example_value': 2, |
- 'id': 353, |
- 'caption': '''Sets how often user has to enter password to use quick unlock.''', |
- 'tags': [], |
- 'desc': '''This setting controls how often the lock screen will request the password to be entered in order to continue using quick unlock. Each time the lock screen is entered, if the last password entry was more than this setting, the quick unlock will not be available on entering the lock screen. Should the user stay on the lock screen past this period of time, a password will be requested next time the user enters the wrong code, or re-enters the lock screen, whichever comes first. |
- |
- If this setting is configured, users using quick unlock will be requested to enter their passwords on the lock screen depending on this setting. |
- |
- If this setting is not configured, users using quick unlock will be requested to enter their password on the lock screen every day.''', |
}, |
], |
'messages': { |