PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote branch 'goog/ics-mr1' into ics-aah

Browse Source
This commit is contained in:
Ed Heyl
2011-10-31 05:54:48 -07:00
parent 991e445900 8fd5e45052
commit a762e1d708
12 changed files with 50 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/com/android/settings/RingerVolumePreference.java
View File

@@ -116,8 +116,14 @@ public class RingerVolumePreference extends VolumePreference implements OnClickL
boolean muted = mAudioManager.isStreamMute(streamType);
if (mCheckBoxes[i] != null) {
mCheckBoxes[i].setImageResource(
muted ? SEEKBAR_MUTED_RES_ID[i] : SEEKBAR_UNMUTED_RES_ID[i]);
if (streamType == AudioManager.STREAM_RING && muted
&& mAudioManager.shouldVibrate(AudioManager.VIBRATE_TYPE_RINGER)) {
mCheckBoxes[i].setImageResource(
com.android.internal.R.drawable.ic_audio_ring_notif_vibrate);
} else {
mCheckBoxes[i].setImageResource(
muted ? SEEKBAR_MUTED_RES_ID[i] : SEEKBAR_UNMUTED_RES_ID[i]);
}
}
if (mSeekBars[i] != null) {
mSeekBars[i].setEnabled(!muted);
@@ -362,7 +368,11 @@ public class RingerVolumePreference extends VolumePreference implements OnClickL
// Touching any of the mute buttons causes us to get the state from the system and toggle it
switch(mAudioManager.getRingerMode()) {
case AudioManager.RINGER_MODE_NORMAL:
mAudioManager.setRingerMode(AudioManager.RINGER_MODE_SILENT);
mAudioManager.setRingerMode(
(Settings.System.getInt(getContext().getContentResolver(),
Settings.System.VIBRATE_IN_SILENT, 1) == 1)
? AudioManager.RINGER_MODE_VIBRATE
: AudioManager.RINGER_MODE_SILENT);
break;
case AudioManager.RINGER_MODE_VIBRATE:
case AudioManager.RINGER_MODE_SILENT:

2
src/com/android/settings/bluetooth/DeviceProfilesSettings.java
View File

@@ -332,7 +332,7 @@ public final class DeviceProfilesSettings extends SettingsPreferenceFragment
* Gray out checkbox while connecting and disconnecting
*/
profilePref.setEnabled(!mCachedDevice.isBusy());
profilePref.setChecked(mCachedDevice.isConnectedProfile(profile));
profilePref.setChecked(profile.isPreferred(device));
profilePref.setSummary(profile.getSummaryResourceForDevice(device));
}

6
src/com/android/settings/tts/TtsEngineSettingsFragment.java
View File

@@ -68,6 +68,9 @@ public class TtsEngineSettingsFragment extends SettingsPreferenceFragment implem
mEngineSettingsPreference.setOnPreferenceClickListener(this);
mInstallVoicesPreference = root.findPreference(KEY_INSTALL_DATA);
mInstallVoicesPreference.setOnPreferenceClickListener(this);
// Remove this preference unless voices are indeed available to install.
root.removePreference(mInstallVoicesPreference);
root.setTitle(getEngineLabel());
root.setKey(getEngineName());
@@ -99,6 +102,9 @@ public class TtsEngineSettingsFragment extends SettingsPreferenceFragment implem
if (unavailable.size() > 0) {
mInstallVoicesPreference.setEnabled(true);
getPreferenceScreen().addPreference(mInstallVoicesPreference);
} else {
getPreferenceScreen().removePreference(mInstallVoicesPreference);
}
if (available.size() > 0) {