commit ceb81f60667091ca9a637304b1a3874e24e5355b
author Wenyi Wang <wenyiw@google.com> Thu Sep 17 21:01:39 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Sep 17 21:01:39 2015 +0000
tree 6dab435ad2c8478a6bd2a350287e043350e61e45
parent 7d9c9ec65c1bcf9a16a84b217bd82d48433b103a
parent 5ed0e93814e4275362a009df1f12586bfc637cdd

Merge "Modified doPickRingtone() and onRingtonePicked() to handle silent ringtone" into ub-contactsdialer-a-dev

src/com/android/contacts/editor/ContactEditorBaseFragment.java

diff --git a/src/com/android/contacts/editor/ContactEditorBaseFragment.java b/src/com/android/contacts/editor/ContactEditorBaseFragment.java
index b5d0e9a..4f2ae78 100644
--- a/src/com/android/contacts/editor/ContactEditorBaseFragment.java
+++ b/src/com/android/contacts/editor/ContactEditorBaseFragment.java
@@ -713,8 +713,10 @@
     }
 
     private void onRingtonePicked(Uri pickedUri) {
-        if (pickedUri == null || RingtoneManager.isDefault(pickedUri)) {
-            mCustomRingtone = null;
+        if (pickedUri == null) {
+            mCustomRingtone = ""; // silent ringtone
+        } else if (RingtoneManager.isDefault(pickedUri)){
+            mCustomRingtone = null; // default ringtone
         } else {
             mCustomRingtone = pickedUri.toString();
         }
@@ -907,7 +909,11 @@
 
         final Uri ringtoneUri;
         if (mCustomRingtone != null) {
-            ringtoneUri = Uri.parse(mCustomRingtone);
+            if ("".equals(mCustomRingtone)) { // select silent ringtone in RingtonePickerActivity
+                ringtoneUri = null;
+            } else {
+                ringtoneUri = Uri.parse(mCustomRingtone);
+            }
         } else {
             // Otherwise pick default ringtone Uri so that something is selected.
             ringtoneUri = RingtoneManager.getDefaultUri(RingtoneManager.TYPE_RINGTONE);