PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ringtone -> Sound

Browse Source 
Test: make -j32
Change-Id: I53864e877e94ff1560f8e9637a87daf7b5118398
This commit is contained in:
Julia Reynolds
2016-11-15 14:53:40 -05:00
parent 08aee17586
commit 35476d12d1
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/android/settings/notification/ChannelNotificationSettings.java
View File

@@ -25,7 +25,6 @@ import android.os.Bundle;
import android.provider.Settings; import android.provider.Settings;
import android.service.notification.NotificationListenerService.Ranking; import android.service.notification.NotificationListenerService.Ranking;
import android.support.v7.preference.Preference; import android.support.v7.preference.Preference;
import android.view.View;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.AppHeader; import com.android.settings.AppHeader;
@@ -166,14 +165,14 @@ public class ChannelNotificationSettings extends NotificationSettingsBase {
} }
private void setupRingtone() { private void setupRingtone() {
mRingtone.setRingtone(mChannel.getRingtone()); mRingtone.setRingtone(mChannel.getSound());
mRingtone.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() { mRingtone.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
@Override @Override
public boolean onPreferenceChange(Preference preference, Object newValue) { public boolean onPreferenceChange(Preference preference, Object newValue) {
Uri ringtone = Uri.parse((String) newValue); Uri ringtone = Uri.parse((String) newValue);
mRingtone.setRingtone(ringtone); mRingtone.setRingtone(ringtone);
mChannel.setRingtone(ringtone); mChannel.setSound(ringtone);
mChannel.lockFields(NotificationChannel.USER_LOCKED_RINGTONE); mChannel.lockFields(NotificationChannel.USER_LOCKED_SOUND);
mBackend.updateChannel(mPkg, mUid, mChannel); mBackend.updateChannel(mPkg, mUid, mChannel);
return false; return false;
} }