commit cab967095570c5d589bd7d38317bab2986b4fb1e
author Jeff Sharkey <jsharkey@android.com> Thu May 30 20:26:03 2013 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu May 30 20:26:03 2013 +0000
tree a8f32d21d276e11901982ad63ea422a5872c867f
parent 10af2d0a45a4ad94fcf6a9b0d572cfe460cc8c1c
parent b772152f9d730000ca405f9e5b0c7bc4afb0e0a7

Merge "Revert "Change titile from Ringtone to Notification sound""

src/com/android/providers/media/RingtonePickerActivity.java

diff --git a/src/com/android/providers/media/RingtonePickerActivity.java b/src/com/android/providers/media/RingtonePickerActivity.java
index 6c867e0..7db1f53 100644
--- a/src/com/android/providers/media/RingtonePickerActivity.java
+++ b/src/com/android/providers/media/RingtonePickerActivity.java
@@ -51,7 +51,6 @@
     private static final String SAVE_CLICKED_POS = "clicked_pos";
 
     private RingtoneManager mRingtoneManager;
-    private int mType;
 
     private Cursor mCursor;
     private Handler mHandler;
@@ -139,9 +138,9 @@
         mRingtoneManager.setIncludeDrm(includeDrm);
 
         // Get the types of ringtones to show
-        mType = intent.getIntExtra(RingtoneManager.EXTRA_RINGTONE_TYPE, -1);
-        if (mType != -1) {
-            mRingtoneManager.setType(mType);
+        int types = intent.getIntExtra(RingtoneManager.EXTRA_RINGTONE_TYPE, -1);
+        if (types != -1) {
+            mRingtoneManager.setType(types);
         }
 
         mCursor = mRingtoneManager.getCursor();
@@ -224,14 +223,6 @@
     }
 
     private int addDefaultRingtoneItem(ListView listView) {
-        if (mType == RingtoneManager.TYPE_NOTIFICATION) {
-            return addStaticItem(listView,
-                    com.android.internal.R.string.notification_sound_default);
-        } else if (mType == RingtoneManager.TYPE_ALARM) {
-            return addStaticItem(listView,
-                    com.android.internal.R.string.alarm_sound_default);
-        }
-
         return addStaticItem(listView, com.android.internal.R.string.ringtone_default);
     }