From dfb654367d4b65fb45089cd8d7d0905e3cd68ae3 Mon Sep 17 00:00:00 2001
From: Amith Yamasani <yamasani@google.com>
Date: Tue, 29 Nov 2011 16:38:14 -0800
Subject: Overhaul vibrate and silent settings to match hard keys.

We go back to the old style of toggling between Mute/Vibrate/Normal.
There is an addition of a checkbox to indicate Vibrate on ring/notif.

Icons in volume dialogs are no longer touchable.

Bug: 5586083

This simplifies the logic in SoundSettings quite a bit, since there's a 1-1 mapping
with ringer mode.

Don't disable volume sliders when muted, so you can go to zero and back up by sliding
your finger. This is because the icons are not clickable anymore.

Change-Id: Ia7ce7e1bf108419eb107f03b7720101efe1598b1
---
 res/xml/sound_settings.xml | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

(limited to 'res/xml')

diff --git a/res/xml/sound_settings.xml b/res/xml/sound_settings.xml
index fc6fdf5..a61e0e1 100644
--- a/res/xml/sound_settings.xml
+++ b/res/xml/sound_settings.xml
@@ -27,16 +27,10 @@
             android:streamType="ring" />
 
     <ListPreference
-            android:key="vibrate"
-            android:title="@string/vibrate_title"
-            android:entries="@array/vibrate_entries"
-            android:entryValues="@array/vibrate_values" />
-
-    <CheckBoxPreference
-            android:key="silent"
+            android:key="silent_mode"
             android:title="@string/silent_mode_title"
-            android:persistent="false"
-            />
+            android:entries="@array/silent_mode_entries"
+            android:entryValues="@array/silent_mode_values" />
 
     <Preference
             android:key="musicfx"
@@ -64,6 +58,11 @@
             android:persistent="false"
             android:ringtoneType="notification" />
 
+    <CheckBoxPreference
+            android:key="vibrate_on_ring"
+            android:title="@string/vibrate_on_ring_title"
+            android:defaultValue="false" />
+
     <PreferenceCategory
             android:title="@string/sound_category_feedback_title"/>
 
-- 
cgit v1.1