From 58cf8299d3ef347e3fd154b1439f50e62f7ca8bf Mon Sep 17 00:00:00 2001
From: Daniel Sandler <dsandler@google.com>
Date: Fri, 26 Feb 2010 15:25:04 -0500
Subject: 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
---
 res/xml/sound_settings.xml | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

(limited to 'res/xml')

diff --git a/res/xml/sound_settings.xml b/res/xml/sound_settings.xml
index e4d80e6..8632871 100644
--- a/res/xml/sound_settings.xml
+++ b/res/xml/sound_settings.xml
@@ -27,6 +27,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" />
+
         <com.android.settings.RingerVolumePreference
                 android:key="ring_volume"
                 android:title="@string/all_volume_title"
@@ -34,7 +41,7 @@
                 android:dialogTitle="@string/all_volume_title"
                 android:persistent="false"
                 android:dependency="silent"
-                android:order="2"
+                android:order="3"
                 android:streamType="ring" />
 
         <com.android.settings.DefaultRingtonePreference
@@ -47,12 +54,13 @@
                 android:order="5"
                 android:ringtoneType="ringtone" />
 
-        <CheckBoxPreference
+        <ListPreference
                 android:key="vibrate"
+                android:order="6"
                 android:title="@string/vibrate_title"
                 android:summary="@string/vibrate_summary"
-                android:order="6"
-                android:persistent="false" />
+                android:entries="@array/vibrate_entries"
+                android:entryValues="@array/vibrate_values" />
 
         <com.android.settings.DefaultRingtonePreference
                 android:key="notification_sound"
-- 
cgit v1.1