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

Merge "Make volume sliders sliceable" into pi-dev am: 4ef7b5f97b

Browse Source 
am: 3fa5b4fad4

Change-Id: Idcbc7acf0343ff74f198ea960b8e6ca3d2e16a20
This commit is contained in:
Julia Reynolds
2018-04-06 15:09:22 -07:00
committed by android-build-merger
parent a220a524fa 3fa5b4fad4
commit 61478b7049
16 changed files with 200 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -126,7 +126,7 @@ public class SoundSettings extends DashboardFragment {
@Override
protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
return buildPreferenceControllers(context, this, mVolumeCallback, getLifecycle());
return buildPreferenceControllers(context, this, getLifecycle());
}
@Override
@@ -145,6 +145,15 @@ 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);
}
// === Volumes ===
final class VolumePreferenceCallback implements VolumeSeekBarPreference.Callback {
@@ -178,18 +187,12 @@ public class SoundSettings extends DashboardFragment {
}
private static List<AbstractPreferenceController> buildPreferenceControllers(Context context,
SoundSettings fragment, VolumeSeekBarPreference.Callback callback,
Lifecycle lifecycle) {
SoundSettings fragment, Lifecycle lifecycle) {
final List<AbstractPreferenceController> controllers = new ArrayList<>();
controllers.add(new ZenModePreferenceController(context, lifecycle, KEY_ZEN_MODE));
controllers.add(new VibrateWhenRingPreferenceController(context));
// === Volumes ===
controllers.add(new AlarmVolumePreferenceController(context, callback, lifecycle));
controllers.add(new MediaVolumePreferenceController(context, callback, lifecycle));
controllers.add(
new NotificationVolumePreferenceController(context, callback, lifecycle));
controllers.add(new RingVolumePreferenceController(context, callback, lifecycle));
// Volumes are added via xml
// === Phone & notification ringtone ===
controllers.add(new PhoneRingtonePreferenceController(context));
@@ -259,7 +262,7 @@ public class SoundSettings extends DashboardFragment {
public List<AbstractPreferenceController> createPreferenceControllers(
Context context) {
return buildPreferenceControllers(context, null /* fragment */,
null /* callback */, null /* lifecycle */);
null /* lifecycle */);
}
@Override