am 515f4384: Merge change Ic31f08c3 into eclair

Merge commit '515f43840b8404b1ad2ef95c0e9704a26c248647' into eclair-mr2

* commit '515f43840b8404b1ad2ef95c0e9704a26c248647':
  Make the default ringtone selected in the list.

diff --git a/src/com/android/deskclock/AlarmPreference.java b/src/com/android/deskclock/AlarmPreference.java
index c1b94f8..a977728 100644 (file)
--- a/src/com/android/deskclock/AlarmPreference.java
+++ b/src/com/android/deskclock/AlarmPreference.java
@@ -41,6 +41,10 @@ public class AlarmPreference extends RingtonePreference {
 
     @Override
     protected Uri onRestoreRingtone() {
+        if (RingtoneManager.isDefault(mAlert)) {
+            return RingtoneManager.getActualDefaultRingtoneUri(getContext(),
+                    RingtoneManager.TYPE_ALARM);
+        }
         return mAlert;
     }