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
This commit is contained in:
Amith Yamasani
2011-11-29 16:38:14 -08:00
parent 2fa017f874
commit dfb654367d
6 changed files with 73 additions and 166 deletions

View File

@@ -550,20 +550,18 @@
<item>auto</item>
</string-array>
<!-- New incoming call vibrate options. -->
<string-array name="vibrate_entries">
<item>Always</item>
<item>Never</item>
<item>Only in Silent mode</item>
<item>Only when not in Silent mode</item>
<!-- Silent mode options. -->
<string-array name="silent_mode_entries">
<item>Off</item>
<item>Vibrate</item>
<item>Mute</item>
</string-array>
<!-- Values for vibrate_entries matching constants in SoundSettings. Do not translate. -->
<string-array name="vibrate_values" translatable="false">
<item>always</item>
<item>never</item>
<item>silent</item>
<item>notsilent</item>
<!-- Values for Silent mode. Do not translate. -->
<string-array name="silent_mode_values" translatable="false">
<item>off</item>
<item>vibrate</item>
<item>mute</item>
</string-array>
<!-- Titles for the list of long press timeout options. -->

View File

@@ -1511,7 +1511,7 @@
<!-- Sound settings screen, setting option name checkbox -->
<string name="vibrate_in_silent_title">Vibrate when silent</string>
<!-- Sound settings screen, setting option name checkbox -->
<string name="vibrate_title">Vibrate</string>
<string name="vibrate_on_ring_title">Vibrate and ring</string>
<!-- Sound settings screen, setting option name -->
<string name="notification_sound_title">Default notification</string>
<!-- Sound settings screen, notification light repeat pulsing title -->