Make the last ringtone selection the default (c81760e0) · Commits · e / os / android_packages_apps_DeskClock

src/com/android/deskclock/AlarmClock.java

+5 −1

Original line number	Diff line number	Diff line
		@@ -323,6 +323,8 @@ public class AlarmClock extends Activity implements LoaderManager.LoaderCallback
		private void saveRingtoneUri(Intent intent) {
		final Uri uri = intent.getParcelableExtra(RingtoneManager.EXTRA_RINGTONE_PICKED_URI);
		mSelectedAlarm.alert = uri;
		// Save the last selected ringtone as the default for new alarms
		RingtoneManager.setActualDefaultRingtoneUri(this, RingtoneManager.TYPE_ALARM, uri);
		asyncUpdateAlarm(mSelectedAlarm, false);
		}

		@@ -818,7 +820,9 @@ public class AlarmClock extends Activity implements LoaderManager.LoaderCallback
		}

		private void asyncAddAlarm() {
		asyncAddAlarm(new Alarm());
		Alarm a = new Alarm();
		a.alert = RingtoneManager.getActualDefaultRingtoneUri(this, RingtoneManager.TYPE_ALARM);
		asyncAddAlarm(a);
		}

		private void asyncDeleteAlarm(final Alarm alarm) {

+0 −9

Original line number	Diff line number	Diff line
		@@ -17,7 +17,6 @@
		package com.android.deskclock;

		import android.app.ActionBar;
		import android.content.Intent;
		import android.content.res.Resources;
		import android.media.AudioManager;
		import android.os.Bundle;
		@@ -69,14 +68,6 @@ public class SettingsActivity extends PreferenceActivity
		super.onCreate(savedInstanceState);
		addPreferencesFromResource(R.xml.settings);

		/* final AlarmPreference ringtone =
		(AlarmPreference) findPreference(KEY_DEFAULT_RINGTONE);
		Uri alert = RingtoneManager.getActualDefaultRingtoneUri(this,
		RingtoneManager.TYPE_ALARM);
		if (alert != null) {
		ringtone.setAlert(alert);
		}
		ringtone.setChangeDefault();*/
		ActionBar actionBar = getActionBar();
		if (actionBar != null) {
		actionBar.setDisplayOptions(ActionBar.DISPLAY_HOME_AS_UP, ActionBar.DISPLAY_HOME_AS_UP);