Merge "Add support for locking the screen when the lid is closed" am: 9dc3c36c9c...

am: 37c8bcbcc9

* commit '37c8bcbcc9f5098a2a7fde91a3b112abd35a85ad':
  Add support for locking the screen when the lid is closed

diff --cc core/java/android/view/WindowManagerPolicy.java
Simple merge

diff --cc core/res/res/values/config.xml
Simple merge

diff --cc core/res/res/values/symbols.xml
index d92adc2,868e4c5..1de4c45
--- 1/core/res/res/values/symbols.xml
--- 2/core/res/res/values/symbols.xml
+++ b/core/res/res/values/symbols.xml
@@@ -1480,9 -1475,8 +1480,10 @@@
    <java-symbol type="bool" name="config_enableLockScreenRotation" />
    <java-symbol type="bool" name="config_enableLockScreenTranslucentDecor" />
    <java-symbol type="bool" name="config_enableTranslucentDecor" />
+   <java-symbol type="bool" name="config_lidControlsScreenLock" />
    <java-symbol type="bool" name="config_lidControlsSleep" />
 +  <java-symbol type="bool" name="config_lockDayNightMode" />
 +  <java-symbol type="bool" name="config_lockUiMode" />
    <java-symbol type="bool" name="config_reverseDefaultRotation" />
    <java-symbol type="bool" name="config_showNavigationBar" />
    <java-symbol type="bool" name="config_supportAutoRotation" />

diff --cc services/core/java/com/android/server/policy/PhoneWindowManager.java
Simple merge

diff --cc services/core/java/com/android/server/wm/WindowManagerService.java
Simple merge