From 431fa27d646a471189f39f4457f3b042665ae9d4 Mon Sep 17 00:00:00 2001 From: Amith Yamasani Date: Wed, 3 Feb 2010 09:46:47 -0800 Subject: [PATCH] Fix an NPE in Volume dialog when notification volume is tied to ringer volume. --- .../android/settings/RingerVolumePreference.java | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/src/com/android/settings/RingerVolumePreference.java b/src/com/android/settings/RingerVolumePreference.java index a546818c0ea..ddadbb64ffc 100644 --- a/src/com/android/settings/RingerVolumePreference.java +++ b/src/com/android/settings/RingerVolumePreference.java @@ -66,14 +66,7 @@ public class RingerVolumePreference extends VolumePreference implements @Override protected void onBindDialogView(View view) { super.onBindDialogView(view); - - mNotificationsUseRingVolumeCheckbox = - (CheckBox) view.findViewById(R.id.same_notification_volume); - mNotificationsUseRingVolumeCheckbox.setOnCheckedChangeListener(this); - mNotificationsUseRingVolumeCheckbox.setChecked(Settings.System.getInt( - getContext().getContentResolver(), - Settings.System.NOTIFICATIONS_USE_RING_VOLUME, 1) == 1); - + for (int i = 0; i < SEEKBAR_ID.length; i++) { SeekBar seekBar = (SeekBar) view.findViewById(SEEKBAR_ID[i]); mSeekBarVolumizer[i] = new SeekBarVolumizer(getContext(), seekBar, @@ -81,6 +74,12 @@ public class RingerVolumePreference extends VolumePreference implements } mNotificationVolumeTitle = (TextView) view.findViewById(R.id.notification_volume_title); + mNotificationsUseRingVolumeCheckbox = + (CheckBox) view.findViewById(R.id.same_notification_volume); + mNotificationsUseRingVolumeCheckbox.setOnCheckedChangeListener(this); + mNotificationsUseRingVolumeCheckbox.setChecked(Settings.System.getInt( + getContext().getContentResolver(), + Settings.System.NOTIFICATIONS_USE_RING_VOLUME, 1) == 1); setNotificationVolumeVisibility(!mNotificationsUseRingVolumeCheckbox.isChecked()); }