Channel settings updates
- Update master switch preference to store enabled state in case it's set before the view holder is bound - Update master switch preference to prevent disabled switches from being toggled - Show an importance summary for max importance - properly handle null notification sounds Change-Id: I395b95b76d2a3c1c94b41d1c2720bb0cf1cae917 Fixes: 36920159 Fixes: 37421928 Fixes: 36939825 Test: RunSettingsRoboTests & manual
This commit is contained in:
@@ -175,9 +175,7 @@ public class ChannelNotificationSettings extends NotificationSettingsBase {
|
||||
mRingtone.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
|
||||
@Override
|
||||
public boolean onPreferenceChange(Preference preference, Object newValue) {
|
||||
Uri ringtone = Uri.parse((String) newValue);
|
||||
mRingtone.setRingtone(ringtone);
|
||||
mChannel.setSound(ringtone, mChannel.getAudioAttributes());
|
||||
mChannel.setSound((Uri) newValue, mChannel.getAudioAttributes());
|
||||
mChannel.lockFields(NotificationChannel.USER_LOCKED_SOUND);
|
||||
mBackend.updateChannel(mPkg, mUid, mChannel);
|
||||
return false;
|
||||
@@ -238,7 +236,7 @@ public class ChannelNotificationSettings extends NotificationSettingsBase {
|
||||
mImportance.setEntryValues(values.toArray(new String[0]));
|
||||
mImportance.setEntries(summaries.toArray(new String[0]));
|
||||
mImportance.setValue(String.valueOf(mChannel.getImportance()));
|
||||
mImportance.setSummary("%s");
|
||||
mImportance.setSummary(getImportanceSummary(mChannel.getImportance()));
|
||||
if (mAppRow.lockedImportance) {
|
||||
mImportance.setEnabled(false);
|
||||
} else {
|
||||
|
Reference in New Issue
Block a user