am 27b402ab: Merge "Set enable_puk_unlock_screen true by default." into ics-factoryrom

* commit '27b402abe5c24a3e21a39458541001ea91465b8f':
  Set enable_puk_unlock_screen true by default.
This commit is contained in:
John Wang
2011-09-21 18:56:47 -07:00
committed by Android Git Automerger

View File

@@ -400,9 +400,9 @@
<!-- Diable lockscreen rotation by default -->
<bool name="config_enableLockScreenRotation">false</bool>
<!-- Diable puk unlockscreen by default.
<!-- Enable puk unlockscreen by default.
If unlock screen is disabled, the puk should be unlocked through Emergency Dialer -->
<bool name="config_enable_puk_unlock_screen">false</bool>
<bool name="config_enable_puk_unlock_screen">true</bool>
<!-- Control the behavior when the user long presses the home button.
0 - Nothing