diff options
| -rw-r--r-- | src/com/android/settings/notification/SoundSettings.java | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/src/com/android/settings/notification/SoundSettings.java b/src/com/android/settings/notification/SoundSettings.java index 3957f13..e932740 100644 --- a/src/com/android/settings/notification/SoundSettings.java +++ b/src/com/android/settings/notification/SoundSettings.java @@ -204,7 +204,7 @@ public class SoundSettings extends SettingsPreferenceFragment implements Indexab updateNotificationPreferenceState(); mSettingsObserver.register(true); mReceiver.register(true); - updateRingOrNotificationPreference(); + updateRingPreference(); updateEffectsSuppressor(); for (VolumeSeekBarPreference volumePref : mVolumePrefs) { volumePref.onActivityResume(); @@ -259,12 +259,14 @@ public class SoundSettings extends SettingsPreferenceFragment implements Indexab } } - private void updateRingOrNotificationPreference() { - mRingPreference.showIcon(mSuppressor != null - ? com.android.internal.R.drawable.ic_audio_ring_notif_mute - : mRingerMode == AudioManager.RINGER_MODE_VIBRATE || wasRingerModeVibrate() - ? com.android.internal.R.drawable.ic_audio_ring_notif_vibrate - : com.android.internal.R.drawable.ic_audio_ring_notif); + private void updateRingPreference() { + if (mRingPreference != null) { + mRingPreference.showIcon(mSuppressor != null + ? com.android.internal.R.drawable.ic_audio_ring_notif_mute + : mRingerMode == AudioManager.RINGER_MODE_VIBRATE || wasRingerModeVibrate() + ? com.android.internal.R.drawable.ic_audio_ring_notif_vibrate + : com.android.internal.R.drawable.ic_audio_ring_notif); + } } private boolean wasRingerModeVibrate() { @@ -276,7 +278,7 @@ public class SoundSettings extends SettingsPreferenceFragment implements Indexab final int ringerMode = mAudioManager.getRingerModeInternal(); if (mRingerMode == ringerMode) return; mRingerMode = ringerMode; - updateRingOrNotificationPreference(); + updateRingPreference(); } private void updateEffectsSuppressor() { @@ -289,7 +291,7 @@ public class SoundSettings extends SettingsPreferenceFragment implements Indexab getSuppressorCaption(suppressor)) : null; mRingPreference.setSuppressionText(text); } - updateRingOrNotificationPreference(); + updateRingPreference(); } private String getSuppressorCaption(ComponentName suppressor) { |