summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Wang <johnwang@google.com>2011-09-21 15:32:39 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-09-21 15:32:39 -0700
commit27b402abe5c24a3e21a39458541001ea91465b8f (patch)
tree35b312dd63048930ed4b67af9ff205675fe3f3e3
parent4aa8d943a970008915b703758743b107927d96fa (diff)
parent5209864a2bcdc089fe3c433fa7aad87f43dbd200 (diff)
downloadframeworks_base-27b402abe5c24a3e21a39458541001ea91465b8f.zip
frameworks_base-27b402abe5c24a3e21a39458541001ea91465b8f.tar.gz
frameworks_base-27b402abe5c24a3e21a39458541001ea91465b8f.tar.bz2
Merge "Set enable_puk_unlock_screen true by default." into ics-factoryrom
-rwxr-xr-xcore/res/res/values/config.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
index 1e5358e..8fea35f 100755
--- a/core/res/res/values/config.xml
+++ b/core/res/res/values/config.xml
@@ -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