Merge branch 'readonly-p4-master' (9536d0b4) · Commits · e / os / android_frameworks_base

api/current.xml

+21 −0

Original line number	Diff line number	Diff line
		@@ -95163,6 +95163,17 @@
		visibility="public"
		>
		</field>
		<field name="ALARM_ALERT"
		type="java.lang.String"
		transient="false"
		volatile="false"
		value=""alarm_alert""
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="ALWAYS_FINISH_ACTIVITIES"
		type="java.lang.String"
		transient="false"
		@@ -95283,6 +95294,16 @@
		visibility="public"
		>
		</field>
		<field name="DEFAULT_ALARM_ALERT_URI"
		type="android.net.Uri"
		transient="false"
		volatile="false"
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="DEFAULT_NOTIFICATION_URI"
		type="android.net.Uri"
		transient="false"

core/java/android/preference/RingtonePreference.java

+3 −2

Original line number	Diff line number	Diff line
		@@ -31,8 +31,9 @@ import android.util.Log;
		* The chosen ringtone's URI will be persisted as a string.
		* <p>
		* If the user chooses the "Default" item, the saved string will be one of
		* {@link System#DEFAULT_RINGTONE_URI} or
		* {@link System#DEFAULT_NOTIFICATION_URI}. If the user chooses the "Silent"
		* {@link System#DEFAULT_RINGTONE_URI},
		* {@link System#DEFAULT_NOTIFICATION_URI}, or
		* {@link System#DEFAULT_ALARM_ALERT_URI}. If the user chooses the "Silent"
		* item, the saved string will be an empty string.
		*
		* @attr ref android.R.styleable#RingtonePreference_ringtoneType

core/java/android/preference/VolumePreference.java

+11 −4

Original line number	Diff line number	Diff line
		@@ -22,6 +22,7 @@ import android.database.ContentObserver;
		import android.media.Ringtone;
		import android.media.RingtoneManager;
		import android.media.AudioManager;
		import android.net.Uri;
		import android.os.Handler;
		import android.preference.PreferenceManager;
		import android.provider.Settings;
		@@ -147,10 +148,16 @@ public class VolumePreference extends SeekBarPreference implements
		System.getUriFor(System.VOLUME_SETTINGS[mStreamType]),
		false, mVolumeObserver);

		mRingtone = RingtoneManager.getRingtone(mContext,
		mStreamType == AudioManager.STREAM_NOTIFICATION
		? Settings.System.DEFAULT_NOTIFICATION_URI
		: Settings.System.DEFAULT_RINGTONE_URI);
		Uri defaultUri = null;
		if (mStreamType == AudioManager.STREAM_RING) {
		defaultUri = Settings.System.DEFAULT_RINGTONE_URI;
		} else if (mStreamType == AudioManager.STREAM_NOTIFICATION) {
		defaultUri = Settings.System.DEFAULT_NOTIFICATION_URI;
		} else {
		defaultUri = Settings.System.DEFAULT_ALARM_ALERT_URI;
		}

		mRingtone = RingtoneManager.getRingtone(mContext, defaultUri);
		mRingtone.setStreamType(mStreamType);
		}

core/java/android/provider/Settings.java

+16 −0

Original line number	Diff line number	Diff line
		@@ -1181,6 +1181,22 @@ public final class Settings {
		*/
		public static final Uri DEFAULT_NOTIFICATION_URI = getUriFor(NOTIFICATION_SOUND);

		/**
		* Persistent store for the system-wide default alarm alert.
		*
		* @see #RINGTONE
		* @see #DEFAULT_ALARM_ALERT_URI
		*/
		public static final String ALARM_ALERT = "alarm_alert";

		/**
		* A {@link Uri} that will point to the current default alarm alert at
		* any given time.
		*
		* @see #DEFAULT_ALARM_ALERT_URI
		*/
		public static final Uri DEFAULT_ALARM_ALERT_URI = getUriFor(ALARM_ALERT);

		/**
		* Setting to enable Auto Replace (AutoText) in text editors. 1 = On, 0 = Off
		*/

media/java/android/media/MediaScanner.java

+12 −0

Original line number	Diff line number	Diff line
		@@ -269,10 +269,14 @@ public class MediaScanner
		private boolean mDefaultRingtoneSet;
		/** Whether the scanner has set a default sound for the notification ringtone. */
		private boolean mDefaultNotificationSet;
		/** Whether the scanner has set a default sound for the alarm ringtone. */
		private boolean mDefaultAlarmSet;
		/** The filename for the default sound for the ringer ringtone. */
		private String mDefaultRingtoneFilename;
		/** The filename for the default sound for the notification ringtone. */
		private String mDefaultNotificationFilename;
		/** The filename for the default sound for the alarm ringtone. */
		private String mDefaultAlarmAlertFilename;
		/**
		* The prefix for system properties that define the default sound for
		* ringtones. Concatenate the name of the setting from Settings
		@@ -331,6 +335,8 @@ public class MediaScanner
		+ Settings.System.RINGTONE);
		mDefaultNotificationFilename = SystemProperties.get(DEFAULT_RINGTONE_PROPERTY_PREFIX
		+ Settings.System.NOTIFICATION_SOUND);
		mDefaultAlarmAlertFilename = SystemProperties.get(DEFAULT_RINGTONE_PROPERTY_PREFIX
		+ Settings.System.ALARM_ALERT);
		}

		private MyMediaScannerClient mClient = new MyMediaScannerClient();
		@@ -709,6 +715,12 @@ public class MediaScanner
		setSettingIfNotSet(Settings.System.RINGTONE, tableUri, rowId);
		mDefaultRingtoneSet = true;
		}
		} else if (alarms && !mDefaultAlarmSet) {
		if (TextUtils.isEmpty(mDefaultAlarmAlertFilename) \|\|
		doesPathHaveFilename(entry.mPath, mDefaultAlarmAlertFilename)) {
		setSettingIfNotSet(Settings.System.ALARM_ALERT, tableUri, rowId);
		mDefaultAlarmSet = true;
		}
		}

		return result;