Merge "Show suppression msg under ringer slider" into pi-dev am: 68f331d452

am: 1351e761c8

Change-Id: I71b7a1ce25f3754ef2041419f2ddde33d48fa7e7
This commit is contained in:
Julia Reynolds
2018-04-17 11:22:04 -07:00
committed by android-build-merger
4 changed files with 24 additions and 13 deletions

View File

@@ -148,10 +148,16 @@ public class SoundSettings extends DashboardFragment {
@Override
public void onAttach(Context context) {
super.onAttach(context);
use(AlarmVolumePreferenceController.class).setCallback(mVolumeCallback);
use(MediaVolumePreferenceController.class).setCallback(mVolumeCallback);
use(RingVolumePreferenceController.class).setCallback(mVolumeCallback);
use(NotificationVolumePreferenceController.class).setCallback(mVolumeCallback);
ArrayList<VolumeSeekBarPreferenceController> volumeControllers = new ArrayList<>();
volumeControllers.add(use(AlarmVolumePreferenceController.class));
volumeControllers.add(use(MediaVolumePreferenceController.class));
volumeControllers.add(use(RingVolumePreferenceController.class));
volumeControllers.add(use(NotificationVolumePreferenceController.class));
for (VolumeSeekBarPreferenceController controller : volumeControllers) {
controller.setCallback(mVolumeCallback);
getLifecycle().addObserver(controller);
}
}
// === Volumes ===