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

@@ -541,11 +541,11 @@ public class Settings extends PreferenceActivity implements ButtonBarHandler {
@Override
public boolean onPreferenceStartFragment(PreferenceFragment caller, Preference pref) {
// Override the fragment title for Wallpaper settings
CharSequence title = pref.getTitle();
int titleRes = pref.getTitleRes();
if (pref.getFragment().equals(WallpaperTypeSettings.class.getName())) {
title = getString(R.string.wallpaper_settings_fragment_title);
titleRes = R.string.wallpaper_settings_fragment_title;
}
startPreferencePanel(pref.getFragment(), pref.getExtras(), 0, title, null, 0);
startPreferencePanel(pref.getFragment(), pref.getExtras(), titleRes, null, null, 0);
return true;
}