From 35476d12d106fef78333ead2464f5ed620ba137d Mon Sep 17 00:00:00 2001 From: Julia Reynolds Date: Tue, 15 Nov 2016 14:53:40 -0500 Subject: [PATCH] Ringtone -> Sound Test: make -j32 Change-Id: I53864e877e94ff1560f8e9637a87daf7b5118398 --- .../settings/notification/ChannelNotificationSettings.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/com/android/settings/notification/ChannelNotificationSettings.java b/src/com/android/settings/notification/ChannelNotificationSettings.java index 1d2ef8cb3f1..8cbdd60f2c8 100644 --- a/src/com/android/settings/notification/ChannelNotificationSettings.java +++ b/src/com/android/settings/notification/ChannelNotificationSettings.java @@ -25,7 +25,6 @@ import android.os.Bundle; import android.provider.Settings; import android.service.notification.NotificationListenerService.Ranking; import android.support.v7.preference.Preference; -import android.view.View; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.AppHeader; @@ -166,14 +165,14 @@ public class ChannelNotificationSettings extends NotificationSettingsBase { } private void setupRingtone() { - mRingtone.setRingtone(mChannel.getRingtone()); + mRingtone.setRingtone(mChannel.getSound()); mRingtone.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() { @Override public boolean onPreferenceChange(Preference preference, Object newValue) { Uri ringtone = Uri.parse((String) newValue); mRingtone.setRingtone(ringtone); - mChannel.setRingtone(ringtone); - mChannel.lockFields(NotificationChannel.USER_LOCKED_RINGTONE); + mChannel.setSound(ringtone); + mChannel.lockFields(NotificationChannel.USER_LOCKED_SOUND); mBackend.updateChannel(mPkg, mUid, mChannel); return false; }