diff options
| author | Daniel Sandler <dsandler@google.com> | 2010-02-26 15:25:04 -0500 |
|---|---|---|
| committer | Daniel Sandler <dsandler@google.com> | 2010-02-26 21:01:59 -0500 |
| commit | 58cf8299d3ef347e3fd154b1439f50e62f7ca8bf (patch) | |
| tree | ed30365cf096f08f3d06da9228ec4cd8a2f812de /res/values | |
| parent | c99cffbffcf38f0e6bf10c9ff541b1bb5180316e (diff) | |
| download | packages_apps_settings-58cf8299d3ef347e3fd154b1439f50e62f7ca8bf.zip packages_apps_settings-58cf8299d3ef347e3fd154b1439f50e62f7ca8bf.tar.gz packages_apps_settings-58cf8299d3ef347e3fd154b1439f50e62f7ca8bf.tar.bz2 | |
Support new vibrate/silent behavior.
The updated settings tree looks like this:
[ ] Silent mode (unchanged)
[ ] Allow vibration in silent mode (new)
Phone vibrate: (changed from boolean)
( ) Always
( ) Only in silent mode
( ) Never
See change I14cf91b0 for explanation & framework support.
Change-Id: I22ba7bcfa5ddf4e545800083c6e80fb655f211e5
Diffstat (limited to 'res/values')
| -rw-r--r-- | res/values/arrays.xml | 13 | ||||
| -rw-r--r-- | res/values/strings.xml | 4 |
2 files changed, 17 insertions, 0 deletions
diff --git a/res/values/arrays.xml b/res/values/arrays.xml index ff68cc7..0aa604d 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -368,4 +368,17 @@ <item>auto</item> </string-array> + <!-- New incoming call vibrate options. --> + <string-array name="vibrate_entries"> + <item>Always</item> + <item>Only when silent</item> + <item>Never</item> + </string-array> + + <!-- Corresponds to AudioManager.VIBRATE_SETTING_*. Do not translate. --> + <string-array name="vibrate_values" translatable="false"> + <item>1</item> + <item>2</item> + <item>0</item> + </string-array> </resources> diff --git a/res/values/strings.xml b/res/values/strings.xml index 4808a69..67196e9 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -954,6 +954,10 @@ <!-- Sound settings screen, setting option summary text --> <string name="ring_volume_summary">""</string> <!-- Sound settings screen, setting option name checkbox --> + <string name="vibrate_in_silent_title">Vibrate when silent</string> + <!-- Sound settings screen, setting option summary text --> + <string name="vibrate_in_silent_summary">Allow vibration feedback in silent mode</string> + <!-- Sound settings screen, setting option name checkbox --> <string name="vibrate_title">Phone vibrate</string> <!-- Sound settings screen, setting option summary text --> <string name="vibrate_summary">Vibrate phone for incoming calls</string> |