diff options
| author | Daniel Sandler <dsandler@android.com> | 2010-04-21 18:15:40 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-04-21 18:15:40 -0700 |
| commit | dd3791844f7172fc9f231e4d7666a8f81f86daa7 (patch) | |
| tree | 5ed11d4a49558daf53de03c8c687f742267f55ca /res | |
| parent | 9e2810bbed6a84b9e6de3464ec855f0b6c241ef1 (diff) | |
| parent | f07466782bb25ce4f2738133d0992f3531af28e5 (diff) | |
| download | packages_apps_Settings-dd3791844f7172fc9f231e4d7666a8f81f86daa7.zip packages_apps_Settings-dd3791844f7172fc9f231e4d7666a8f81f86daa7.tar.gz packages_apps_Settings-dd3791844f7172fc9f231e4d7666a8f81f86daa7.tar.bz2 | |
am f0746678: Merge "Redesign vibration settings." into froyo
Merge commit 'f07466782bb25ce4f2738133d0992f3531af28e5' into froyo-plus-aosp
* commit 'f07466782bb25ce4f2738133d0992f3531af28e5':
Redesign vibration settings.
Diffstat (limited to 'res')
| -rw-r--r-- | res/values/arrays.xml | 12 | ||||
| -rw-r--r-- | res/values/strings.xml | 4 | ||||
| -rw-r--r-- | res/xml/sound_settings.xml | 21 |
3 files changed, 16 insertions, 21 deletions
diff --git a/res/values/arrays.xml b/res/values/arrays.xml index 0ae8eb4..f16f8c9 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -388,14 +388,16 @@ <!-- New incoming call vibrate options. --> <string-array name="vibrate_entries"> <item>Always</item> - <item>Only when silent</item> <item>Never</item> + <item>Only in Silent mode</item> + <item>Only when not in Silent mode</item> </string-array> - <!-- Corresponds to AudioManager.VIBRATE_SETTING_*. Do not translate. --> + <!-- Values for vibrate_entries matching constants in SoundSettings. Do not translate. --> <string-array name="vibrate_values" translatable="false"> - <item>1</item> - <item>2</item> - <item>0</item> + <item>always</item> + <item>never</item> + <item>silent</item> + <item>notsilent</item> </string-array> </resources> diff --git a/res/values/strings.xml b/res/values/strings.xml index 5bdbbf9..ab29f2d 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -1022,9 +1022,9 @@ <!-- 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> + <string name="vibrate_title">Vibrate</string> <!-- Sound settings screen, setting option summary text --> - <string name="vibrate_summary">Vibrate phone for incoming calls</string> + <string name="vibrate_summary">Vibration feedback for calls and notifications</string> <!-- Sound settings screen, setting option name --> <string name="notification_sound_title">Notification ringtone</string> <!-- Sound settings screen, setting option summary text --> diff --git a/res/xml/sound_settings.xml b/res/xml/sound_settings.xml index 23e6540..1091b90 100644 --- a/res/xml/sound_settings.xml +++ b/res/xml/sound_settings.xml @@ -31,12 +31,13 @@ android:order="1" android:disableDependentsState="true" /> - <CheckBoxPreference - android:key="vibrate_in_silent" - android:title="@string/vibrate_in_silent_title" - android:summary="@string/vibrate_in_silent_summary" - android:order="2" - android:persistent="false" /> + <ListPreference + android:key="vibrate" + android:order="6" + android:title="@string/vibrate_title" + android:summary="@string/vibrate_summary" + android:entries="@array/vibrate_entries" + android:entryValues="@array/vibrate_values" /> <com.android.settings.RingerVolumePreference android:key="ring_volume" @@ -63,14 +64,6 @@ android:order="5" android:ringtoneType="ringtone" /> - <ListPreference - android:key="vibrate" - android:order="6" - android:title="@string/vibrate_title" - android:summary="@string/vibrate_summary" - android:entries="@array/vibrate_entries" - android:entryValues="@array/vibrate_values" /> - </PreferenceCategory> <PreferenceCategory |