From 42d2b08454270f94eeda65ab0356f19fbd84875f Mon Sep 17 00:00:00 2001 From: Jacky Wang Date: Wed, 16 Oct 2024 12:22:42 +0800 Subject: [PATCH] Remove isCatalystEnabled check from SoundSettings Bug: 360015496 Flag: EXEMPT N/A Test: atest SoundScreenTest Change-Id: I3b392d009eaaf59ee77a1ea9951a7191fcc521d5 --- .../settings/notification/SoundSettings.java | 28 +++++++++---------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/src/com/android/settings/notification/SoundSettings.java b/src/com/android/settings/notification/SoundSettings.java index 596f19bc62a..b069c7e1322 100644 --- a/src/com/android/settings/notification/SoundSettings.java +++ b/src/com/android/settings/notification/SoundSettings.java @@ -195,23 +195,21 @@ public class SoundSettings extends DashboardFragment implements OnActivityResult @Override public void onAttach(Context context) { super.onAttach(context); - if (!isCatalystEnabled()) { - ArrayList volumeControllers = new ArrayList<>(); - volumeControllers.add(use(AlarmVolumePreferenceController.class)); - volumeControllers.add(use(MediaVolumePreferenceController.class)); - volumeControllers.add(use(SeparateRingVolumePreferenceController.class)); - volumeControllers.add(use(NotificationVolumePreferenceController.class)); - volumeControllers.add(use(CallVolumePreferenceController.class)); + ArrayList volumeControllers = new ArrayList<>(); + volumeControllers.add(use(AlarmVolumePreferenceController.class)); + volumeControllers.add(use(MediaVolumePreferenceController.class)); + volumeControllers.add(use(SeparateRingVolumePreferenceController.class)); + volumeControllers.add(use(NotificationVolumePreferenceController.class)); + volumeControllers.add(use(CallVolumePreferenceController.class)); - use(HandsFreeProfileOutputPreferenceController.class).setCallback(listPreference -> - onPreferenceDataChanged(listPreference)); - mHfpOutputControllerKey = - use(HandsFreeProfileOutputPreferenceController.class).getPreferenceKey(); + use(HandsFreeProfileOutputPreferenceController.class).setCallback(listPreference -> + onPreferenceDataChanged(listPreference)); + mHfpOutputControllerKey = + use(HandsFreeProfileOutputPreferenceController.class).getPreferenceKey(); - for (VolumeSeekBarPreferenceController controller : volumeControllers) { - controller.setCallback(mVolumeCallback); - getSettingsLifecycle().addObserver(controller); - } + for (VolumeSeekBarPreferenceController controller : volumeControllers) { + controller.setCallback(mVolumeCallback); + getSettingsLifecycle().addObserver(controller); } }