Finally, a place for notification settings.
Consolidated under the new Notifications settings are:
- Ringtone (from Sound)
- Zen Mode (from Sound)
- Pulse LED (from Display)
- Heads-Up Notifications (from Display)
- Notification Access (from Security)
- Show when locked (from Security)
Change-Id: I214d03ba1e356e088323a3058d98d390b8a8f988
diff --git a/src/com/android/settings/SoundSettings.java b/src/com/android/settings/SoundSettings.java
index d506864..45fd0db 100644
--- a/src/com/android/settings/SoundSettings.java
+++ b/src/com/android/settings/SoundSettings.java
@@ -75,7 +75,6 @@
private static final String KEY_DOCK_AUDIO_SETTINGS = "dock_audio";
private static final String KEY_DOCK_SOUNDS = "dock_sounds";
private static final String KEY_DOCK_AUDIO_MEDIA_ENABLED = "dock_audio_media_enabled";
- private static final String KEY_ZEN_MODE = "zen_mode";
private static final String[] NEED_VOICE_CAPABILITY = {
KEY_RINGTONE, KEY_DTMF_TONE, KEY_CATEGORY_CALLS,
@@ -102,7 +101,6 @@
private CheckBoxPreference mDockSounds;
private Intent mDockIntent;
private CheckBoxPreference mDockAudioMediaEnabled;
- private ZenModeListPreference mZenModeListPreference;
private Handler mHandler = new Handler() {
public void handleMessage(Message msg) {
@@ -229,9 +227,6 @@
};
initDockSettings();
-
- mZenModeListPreference = (ZenModeListPreference) findPreference(KEY_ZEN_MODE);
- mZenModeListPreference.init();
}
@Override
@@ -253,8 +248,13 @@
private void updateRingtoneName(int type, Preference preference, int msg) {
if (preference == null) return;
- Context context = getActivity();
- if (context == null) return;
+ final CharSequence summary = updateRingtoneName(getActivity(), type);
+ if (summary == null) return;
+ mHandler.sendMessage(mHandler.obtainMessage(msg, summary));
+ }
+
+ public static CharSequence updateRingtoneName(Context context, int type) {
+ if (context == null) return null;
Uri ringtoneUri = RingtoneManager.getActualDefaultRingtoneUri(context, type);
CharSequence summary = context.getString(com.android.internal.R.string.ringtone_unknown);
// Is it a silent ringtone?
@@ -275,7 +275,7 @@
// Unknown title for the ringtone
}
}
- mHandler.sendMessage(mHandler.obtainMessage(msg, summary));
+ return summary;
}
private void lookupRingtoneNames() {