Merge from vscode 81d7885dc2e9dc617e1522697a2966bc4025a45d (#5949)

* Merge from vscode 81d7885dc2e9dc617e1522697a2966bc4025a45d

* Fix vs unit tests and hygiene issue

* Fix strict null check issue
This commit is contained in:
Chris LaFreniere
2019-06-10 18:27:09 -07:00
committed by GitHub
parent ff38bc8143
commit d15a3fcc98
926 changed files with 19529 additions and 11383 deletions

View File

@@ -180,6 +180,12 @@ import { isMacintosh } from 'vs/base/common/platform';
'default': true,
'description': nls.localize('activityBarVisibility', "Controls the visibility of the activity bar in the workbench.")
},
// TODO @misolori remove before shipping stable
'workbench.iconExploration.enabled': {
'type': 'boolean',
'default': false,
'description': nls.localize('iconExplorationEnabled', "Controls the visibility of the icon exploration in the workbench.")
},
'workbench.view.alwaysShowHeaderActions': {
'type': 'boolean',
'default': false,