From ef734a8015405244d1822aa6ec4a0d20da253a05 Mon Sep 17 00:00:00 2001 From: Ido Ben-Hur Date: Mon, 19 Jun 2023 22:27:28 +0300 Subject: [PATCH] Settings: Allow separating ringer & notification sound streams Using the newly added device config (QPR3). AOSP have already implemented listeners for this to be runtime, but it seems like they never tested settings side properly - especially when the toggle is at the same page. After fixing some funny logic errors it now updates just fine. base side needs no extra modifications, the observers there are programmed correctly. Change-Id: Ic171b8411409e8936db7d22ed45e21723e6f66d6 --- res/values/custom_strings.xml | 3 + res/xml/sound_settings.xml | 7 ++ ...otificationVolumePreferenceController.java | 24 +++--- .../RingVolumePreferenceController.java | 8 +- ...eparateRingVolumePreferenceController.java | 8 +- .../settings/notification/SoundSettings.java | 6 ++ .../VolumeSeekBarPreferenceController.java | 4 +- ...arateNotificationPreferenceController.java | 77 +++++++++++++++++++ 8 files changed, 123 insertions(+), 14 deletions(-) create mode 100644 src/com/android/settings/sound/SeparateNotificationPreferenceController.java diff --git a/res/values/custom_strings.xml b/res/values/custom_strings.xml index 4f4b2a5cee0..4e0df163dbb 100644 --- a/res/values/custom_strings.xml +++ b/res/values/custom_strings.xml @@ -342,4 +342,7 @@ Smart 5G Automatically switch between 5G and 4G to reduce battery consumption + + Separated Ring and Notification + Allow controlling each stream individually diff --git a/res/xml/sound_settings.xml b/res/xml/sound_settings.xml index 01886e65729..d76d17dbb47 100644 --- a/res/xml/sound_settings.xml +++ b/res/xml/sound_settings.xml @@ -97,6 +97,13 @@ android:order="-140" settings:controller="com.android.settings.notification.AlarmVolumePreferenceController"/> + + + buildPreferenceControllers(Con controllers.add(new AlarmRingtonePreferenceController(context)); controllers.add(new NotificationRingtonePreferenceController(context)); + final SeparateNotificationPreferenceController separateNotificationPreferenceController = + new SeparateNotificationPreferenceController(context); + + controllers.add(separateNotificationPreferenceController); + return controllers; } diff --git a/src/com/android/settings/notification/VolumeSeekBarPreferenceController.java b/src/com/android/settings/notification/VolumeSeekBarPreferenceController.java index 0414565721e..235e7ba5e13 100644 --- a/src/com/android/settings/notification/VolumeSeekBarPreferenceController.java +++ b/src/com/android/settings/notification/VolumeSeekBarPreferenceController.java @@ -54,9 +54,7 @@ public void setCallback(Callback callback) { @Override public void displayPreference(PreferenceScreen screen) { super.displayPreference(screen); - if (isAvailable()) { - setupVolPreference(screen); - } + setupVolPreference(screen); } protected void setupVolPreference(PreferenceScreen screen) { diff --git a/src/com/android/settings/sound/SeparateNotificationPreferenceController.java b/src/com/android/settings/sound/SeparateNotificationPreferenceController.java new file mode 100644 index 00000000000..d807c7f419b --- /dev/null +++ b/src/com/android/settings/sound/SeparateNotificationPreferenceController.java @@ -0,0 +1,77 @@ +/* + * Copyright (C) 2023 Yet Another AOSP Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed under the + * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +package com.android.settings.sound; + +import android.content.Context; +import android.provider.DeviceConfig; + +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + +import com.android.settings.R; +import com.android.settingslib.core.AbstractPreferenceController; + +/** + * A simple preference controller to allow splitting notification and ringtone streams + */ +public class SeparateNotificationPreferenceController extends AbstractPreferenceController + implements Preference.OnPreferenceChangeListener { + + private static final String KEY = "volume_separate_notification"; + + private SwitchPreference mPreference; + + public SeparateNotificationPreferenceController(Context context) { + super(context); + } + + @Override + public boolean isAvailable() { + return true; + } + + @Override + public String getPreferenceKey() { + return KEY; + } + + @Override + public void displayPreference(PreferenceScreen screen) { + super.displayPreference(screen); + mPreference = (SwitchPreference) screen.findPreference(KEY); + mPreference.setChecked(getDeviceConfig(KEY)); + mPreference.setOnPreferenceChangeListener(this); + } + + @Override + public boolean onPreferenceChange(Preference preference, Object newValue) { + if (preference == mPreference) { + final boolean value = (Boolean) newValue; + updateDeviceConfig(KEY, value); + return true; + } + return false; + } + + private boolean getDeviceConfig(String key) { + return DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_SYSTEMUI, key, false); + } + + private void updateDeviceConfig(String key, boolean enabled) { + DeviceConfig.setProperty(DeviceConfig.NAMESPACE_SYSTEMUI, + key, String.valueOf(enabled), false /* makeDefault */); + } +}