am 340990a2: am af487099: Merge "Fix 4560303: Add setting to lock later when power button pressed" into ics-mr1

* commit '340990a2d29f566b83dc551e3c5f748c96bd99f2':
  Fix 4560303: Add setting to lock later when power button pressed
This commit is contained in:
Jim Miller
2012-01-10 10:32:40 -08:00
committed by Android Git Automerger
6 changed files with 29 additions and 0 deletions

View File

@@ -2228,6 +2228,8 @@
<string name="lockpattern_settings_enable_visible_pattern_title">Make pattern visible</string>
<!-- Security & location settings screen, setting check box title. This setting controls whether tactile feedback will be produced when the user draws the pattern.-->
<string name="lockpattern_settings_enable_tactile_feedback_title">Vibrate on touch</string>
<!-- Security & location settings screen, setting check box title. This controls whether the device locks immediately when the power button is pressed. [CHAR LIMIT=28]-->
<string name="lockpattern_settings_enable_power_button_instantly_locks">Power button instantly locks</string>
<!-- Security & location settings screen, setting option name when user has never set an unlock pattern -->
<string name="lockpattern_settings_choose_lock_pattern">Set unlock pattern</string>
<!-- Security & location settings screen, setting option name when user has previously set an unlock pattern and wants to change to a new pattern -->