summaryrefslogtreecommitdiffstats
path: root/src/com
diff options
context:
space:
mode:
authorEric Laurent <elaurent@google.com>2011-07-20 11:04:31 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-07-20 11:04:31 -0700
commit5738617723fb88c019fb1db34daa3126c42df7d7 (patch)
tree061a6b286f9eae6554afeae7551057ba0802fec3 /src/com
parent79da62dce8f7b27f727e2dac35fda7ec003d1ec8 (diff)
parent9133a10190a4e788a5dfb616ce18c25549f5e1dc (diff)
downloadpackages_apps_settings-5738617723fb88c019fb1db34daa3126c42df7d7.zip
packages_apps_settings-5738617723fb88c019fb1db34daa3126c42df7d7.tar.gz
packages_apps_settings-5738617723fb88c019fb1db34daa3126c42df7d7.tar.bz2
Merge "Fix issue 5012047: silent mode mutes music"
Diffstat (limited to 'src/com')
-rw-r--r--src/com/android/settings/RingerVolumePreference.java34
1 files changed, 20 insertions, 14 deletions
diff --git a/src/com/android/settings/RingerVolumePreference.java b/src/com/android/settings/RingerVolumePreference.java
index b546265..f850b08 100644
--- a/src/com/android/settings/RingerVolumePreference.java
+++ b/src/com/android/settings/RingerVolumePreference.java
@@ -171,12 +171,15 @@ public class RingerVolumePreference extends VolumePreference implements
mNotificationsUseRingVolumeCheckbox =
(CheckBox) view.findViewById(R.id.same_notification_volume);
mNotificationsUseRingVolumeCheckbox.setOnCheckedChangeListener(this);
- mNotificationsUseRingVolumeCheckbox.setChecked(
- Utils.isVoiceCapable(getContext())
- && Settings.System.getInt(
+ mNotificationsUseRingVolumeCheckbox.setChecked(Settings.System.getInt(
getContext().getContentResolver(),
Settings.System.NOTIFICATIONS_USE_RING_VOLUME, 1) == 1);
- setNotificationVolumeVisibility(!mNotificationsUseRingVolumeCheckbox.isChecked());
+ // Notification volume always visible for non voice capable devices
+ if (Utils.isVoiceCapable(getContext())) {
+ setNotificationVolumeVisibility(!mNotificationsUseRingVolumeCheckbox.isChecked());
+ } else {
+ setNotificationVolumeVisibility(true);
+ }
disableSettingsThatNeedVoice(view);
// Register callbacks for mute/unmute buttons
@@ -240,16 +243,19 @@ public class RingerVolumePreference extends VolumePreference implements
}
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
- setNotificationVolumeVisibility(!isChecked);
-
- Settings.System.putInt(getContext().getContentResolver(),
- Settings.System.NOTIFICATIONS_USE_RING_VOLUME, isChecked ? 1 : 0);
-
- if (isChecked) {
- // The user wants the notification to be same as ring, so do a
- // one-time sync right now
- mAudioManager.setStreamVolume(AudioManager.STREAM_NOTIFICATION,
- mAudioManager.getStreamVolume(AudioManager.STREAM_RING), 0);
+ // ignore R.id.same_notification_volume checkbox for non voice capable devices
+ if (Utils.isVoiceCapable(getContext())) {
+ setNotificationVolumeVisibility(!isChecked);
+
+ Settings.System.putInt(getContext().getContentResolver(),
+ Settings.System.NOTIFICATIONS_USE_RING_VOLUME, isChecked ? 1 : 0);
+
+ if (isChecked) {
+ // The user wants the notification to be same as ring, so do a
+ // one-time sync right now
+ mAudioManager.setStreamVolume(AudioManager.STREAM_NOTIFICATION,
+ mAudioManager.getStreamVolume(AudioManager.STREAM_RING), 0);
+ }
}
}