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

Merge "Remove isCatalystEnabled check from SoundSettings" into main

Browse Source
This commit is contained in:
Jacky Wang
2024-10-16 06:51:28 +00:00
committed by Android (Google) Code Review
parent 700f7e9ab2 42d2b08454
commit 085a623171
1 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/com/android/settings/notification/SoundSettings.java
View File

@@ -195,23 +195,21 @@ public class SoundSettings extends DashboardFragment implements OnActivityResult
@Override @Override
public void onAttach(Context context) { public void onAttach(Context context) {
super.onAttach(context); super.onAttach(context);
if (!isCatalystEnabled()) { ArrayList<VolumeSeekBarPreferenceController> volumeControllers = new ArrayList<>();
ArrayList<VolumeSeekBarPreferenceController> volumeControllers = new ArrayList<>(); volumeControllers.add(use(AlarmVolumePreferenceController.class));
volumeControllers.add(use(AlarmVolumePreferenceController.class)); volumeControllers.add(use(MediaVolumePreferenceController.class));
volumeControllers.add(use(MediaVolumePreferenceController.class)); volumeControllers.add(use(SeparateRingVolumePreferenceController.class));
volumeControllers.add(use(SeparateRingVolumePreferenceController.class)); volumeControllers.add(use(NotificationVolumePreferenceController.class));
volumeControllers.add(use(NotificationVolumePreferenceController.class)); volumeControllers.add(use(CallVolumePreferenceController.class));
volumeControllers.add(use(CallVolumePreferenceController.class));
use(HandsFreeProfileOutputPreferenceController.class).setCallback(listPreference -> use(HandsFreeProfileOutputPreferenceController.class).setCallback(listPreference ->
onPreferenceDataChanged(listPreference)); onPreferenceDataChanged(listPreference));
mHfpOutputControllerKey = mHfpOutputControllerKey =
use(HandsFreeProfileOutputPreferenceController.class).getPreferenceKey(); use(HandsFreeProfileOutputPreferenceController.class).getPreferenceKey();
for (VolumeSeekBarPreferenceController controller : volumeControllers) { for (VolumeSeekBarPreferenceController controller : volumeControllers) {
controller.setCallback(mVolumeCallback); controller.setCallback(mVolumeCallback);
getSettingsLifecycle().addObserver(controller); getSettingsLifecycle().addObserver(controller);
}
} }
} }